fix(tests/bigquery): implement uuid-based isolation and reliable resource cleanup by NirajNandre · Pull Request #2547 · googleapis/mcp-toolbox

NirajNandre · 2026-02-23T06:29:37Z

Description

Description of Changes:

Centralized Cleanup: Added CleanupBigQueryDatasets to tests/common.go which uses DeleteWithContents to recursively wipe test datasets.
UUID Isolation: Refactored BigQuery integration tests to generate a single uniqueID per run, used as a suffix for all datasets and tables.
Reliable Teardown: Replaced defer calls with t.Cleanup to guarantee resource removal even after test timeouts or fatal errors.
Logging: Added t.Logf statements to track the uniqueID throughout the test lifecycle for easier debugging.
Deadlock Resolution (Log Draining): Added a background goroutine to drain cmd.Out using io.Copy(io.Discard, cmd.Out) immediately after the server starts.

Why it was required:

Prevent Resource Leaks: Previous tests often leaked "Disallowed" datasets if table deletion failed, cluttering the toolbox-testing-438616 project.
Enable Concurrency: Using a single shared project for CI/CD requires strict isolation so concurrent builds do not delete or overwrite each other's data.
Timeout Resilience: Standard defer blocks could fail if the test context was cancelled; using context.Background() in t.Cleanup ensures teardown logic has a fresh context to complete.
Timeout & Deadlock Fix: I observed a deadlock where the Toolbox server would block while attempting to write logs to a full 64KB OS pipe buffer. Since the test runner was waiting for an HTTP response from the blocked server, the entire suite would time out at 10 minutes.

PR Checklist

Thank you for opening a Pull Request! Before submitting your PR, there are a
few things you can do to make sure it goes smoothly:

Make sure you reviewed
CONTRIBUTING.md
Make sure to open an issue as a
bug/issue
before writing your code! That way we can discuss the change, evaluate
designs, and agree on the general idea
Ensure the tests and linter pass
Code coverage does not decrease (if any source code was changed)
Appropriate docs were updated (if necessary)
Make sure to add ! if this involve a breaking change

🛠️ Fixes #<issue_number_goes_here>

gemini-code-assist · 2026-02-23T06:29:49Z

Summary of Changes

Hello @NirajNandre, I'm Gemini Code Assist¹! I'm currently reviewing this pull request and will post my feedback shortly. In the meantime, here's a summary to help you and other reviewers quickly get up to speed!

This pull request significantly enhances the robustness and reliability of BigQuery integration tests. By standardizing on a single UUID for all test-created resources and implementing a t.Cleanup hook, it ensures that test environments are properly isolated and that temporary BigQuery datasets are consistently removed after each test run, preventing resource leakage and potential conflicts.

Highlights

UUID-based Isolation: Implemented a single, consistent UUID for naming all BigQuery test resources (datasets and tables) within a single test run, ensuring better isolation between concurrent test executions.
Reliable Resource Cleanup: Introduced a t.Cleanup hook in BigQuery integration tests to automatically delete all datasets associated with a test's unique ID, improving the reliability of resource cleanup.
Centralized Cleanup Utility: Added a new utility function, CleanupBigQueryDatasets, in tests/common.go to handle the iterative deletion of BigQuery datasets that match a given unique identifier.

Changelog

tests/bigquery/bigquery_integration_test.go
- Generated a single uniqueID at the start of each test function (TestBigQueryToolEndpoints, TestBigQueryToolWithDatasetRestriction) to identify all resources created by that test.
- Modified dataset and table naming conventions to incorporate the uniqueID instead of generating new UUIDs for each resource.
- Added a t.Cleanup function to invoke tests.CleanupBigQueryDatasets at the end of each test, ensuring all associated BigQuery datasets are deleted.
tests/common.go
- Added new imports for bigqueryapi and iterator packages to support BigQuery client operations.
- Implemented the CleanupBigQueryDatasets function, which iterates through all BigQuery datasets and deletes those whose IDs contain the provided uniqueID.

Using Gemini Code Assist

The full guide for Gemini Code Assist can be found on our documentation page, here are some quick tips.

Invoking Gemini

You can request assistance from Gemini at any point by creating a comment using either /gemini <command> or @gemini-code-assist <command>. Below is a summary of the supported commands on the current page.

Feature	Command	Description
Code Review	`/gemini review`	Performs a code review for the current pull request in its current state.
Pull Request Summary	`/gemini summary`	Provides a summary of the current pull request in its current state.
Comment	@gemini-code-assist	Responds in comments when explicitly tagged, both in pull request comments and review comments.
Help	`/gemini help`	Displays a list of available commands.

Customization

To customize Gemini Code Assist for GitHub experience, repository maintainers can create a configuration file and/or provide a custom code review style guide (such as PEP-8 for Python) by creating and adding files to a .gemini/ folder in the base of the repository. Detailed instructions can be found here.

Limitations & Feedback

Gemini Code Assist may make mistakes. Please leave feedback on any instances where its feedback is incorrect or counter productive. You can react with 👍 and 👎 on @gemini-code-assist comments. If you're interested in giving your feedback about your experience with Gemini Code Assist for Github and other Google products, sign up here.

You can also get AI-powered code generation, chat, as well as code reviews directly in the IDE at no cost with the Gemini Code Assist IDE Extension.

Review the Privacy Notices, Generative AI Prohibited Use Policy, Terms of Service, and learn how to configure Gemini Code Assist in GitHub here. Gemini can make mistakes, so double check it and use code with caution. ↩

gemini-code-assist

Code Review

This pull request improves BigQuery integration tests by implementing UUID-based isolation and a centralized resource cleanup mechanism. Using a shared uniqueID across a test run ensures that all temporary datasets and tables are consistently named and can be reliably identified for deletion. The identified critical issue in the cleanup implementation, where a non-existent method is called on the BigQuery client, has been retained as it does not contradict any provided rules and requires correction.

tests/common.go

…urce cleanup

anubhav756 · 2026-03-26T10:55:46Z

/gcbrun

anubhav756 · 2026-03-26T12:30:07Z

/gcbrun

anubhav756 · 2026-03-26T13:13:13Z

/gcbrun

anubhav756 · 2026-03-27T11:17:27Z

/gcbrun

anubhav756 · 2026-03-27T11:38:22Z

/gcbrun

anubhav756 · 2026-03-27T13:08:57Z

/gcbrun

tests/bigquery/bigquery_integration_test.go

tests/common.go

anubhav756 · 2026-03-27T15:17:26Z

/gcbrun

…ble resource cleanup (googleapis#2547) ## Description ### **Description of Changes:** - **Centralized Cleanup**: Added `CleanupBigQueryDatasets` to `tests/common.go` which uses `DeleteWithContents` to recursively wipe test datasets. - **UUID Isolation**: Refactored BigQuery integration tests to generate a single `uniqueID` per run, used as a suffix for all datasets and tables. - **Reliable Teardown**: Replaced defer calls with `t.Cleanup` to guarantee resource removal even after test timeouts or fatal errors. - **Logging**: Added `t.Logf` statements to track the `uniqueID` throughout the test lifecycle for easier debugging. - **Deadlock Resolution (Log Draining)**: Added a background goroutine to drain `cmd.Out` using `io.Copy(io.Discard, cmd.Out)` immediately after the server starts. ### **Why it was required:** - **Prevent Resource Leaks**: Previous tests often leaked "Disallowed" datasets if table deletion failed, cluttering the `toolbox-testing-438616` project. - **Enable Concurrency**: Using a single shared project for CI/CD requires strict isolation so concurrent builds do not delete or overwrite each other's data. - **Timeout Resilience**: Standard `defer` blocks could fail if the test context was cancelled; using `context.Background()` in t.Cleanup ensures teardown logic has a fresh context to complete. - **Timeout & Deadlock Fix**: I observed a deadlock where the Toolbox server would block while attempting to write logs to a full `64KB` OS pipe buffer. Since the test runner was waiting for an HTTP response from the blocked server, the entire suite would time out at 10 minutes. ## PR Checklist > Thank you for opening a Pull Request! Before submitting your PR, there are a > few things you can do to make sure it goes smoothly: - [ ] Make sure you reviewed [CONTRIBUTING.md](https://github.com/googleapis/genai-toolbox/blob/main/CONTRIBUTING.md) - [ ] Make sure to open an issue as a [bug/issue](https://github.com/googleapis/genai-toolbox/issues/new/choose) before writing your code! That way we can discuss the change, evaluate designs, and agree on the general idea - [ ] Ensure the tests and linter pass - [ ] Code coverage does not decrease (if any source code was changed) - [ ] Appropriate docs were updated (if necessary) - [ ] Make sure to add `!` if this involve a breaking change 🛠️ Fixes #<issue_number_goes_here> 479d842

🤖 I have created a release *beep* *boop* --- ## [0.32.0](v0.31.0...v0.32.0) (2026-04-08) ### ⚠ BREAKING CHANGES * update repo name ([#2968](#2968)) ### Features * Add MCP tool annotations to all remaining tools ([#2221](#2221)) ([ea09db9](ea09db9)) * **bigquery:** Add conversational analytics tools for Data Agents ([#2517](#2517)) ([2490a4b](2490a4b)) * **embeddingModel:** Add Backend API selection fields ([#2592](#2592)) ([912aa9e](912aa9e)) * **skills:** Add Claude Code support to generated scripts ([#2966](#2966)) ([a1609e1](a1609e1)) * **skills:** Add codex user agent ([#2973](#2973)) ([070e939](070e939)) * **skills:** Tool invocation via npx ([#2916](#2916)) ([377dc5b](377dc5b)) * **sources/singlestore:** Add ConnectionParams to SingleStore Config ([#2555](#2555)) ([73e2a8c](73e2a8c)) * **tool/dataplex-lookup-context:** Relax project constraint and enforce location ([#2952](#2952)) ([7ebfdf1](7ebfdf1)) * **tools/looker:** Looker agent management from MCP ([#2830](#2830)) ([649d4ad](649d4ad)) * **ui:** Update to use `/mcp` endpoint ([#2829](#2829)) ([c3059c2](c3059c2)) ### Bug Fixes * **bigquery:** Add impersonateServiceAccount to prebuilt config ([#2770](#2770)) ([9c3a748](9c3a748)) * **quickstart:** Robust tool lookup and modernize dependencies in Python samples ([#2863](#2863)) ([4c0845d](4c0845d)) * **skills:** Fix skill generation template ([#2914](#2914)) ([a01a15e](a01a15e)) * **skills:** Prevent empty strings overriding optional env vars in node scripts ([#2963](#2963)) ([c52adeb](c52adeb)) * **tests/bigquery:** Implement uuid-based isolation and reliable resource cleanup ([#2547](#2547)) ([479d842](479d842)) * **tests/Bigtable:** Implement uuid-based isolation and reliable resource cleanup ([#2880](#2880)) ([a769f15](a769f15)) * Update error for ConvertConfig function ([#2993](#2993)) ([62bdabb](62bdabb)) ### Code Refactoring * Update repo name ([#2968](#2968)) ([3aae809](3aae809)) --- This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please). --------- Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com> Co-authored-by: Yuan Teoh <45984206+Yuan325@users.noreply.github.com>

🤖 I have created a release *beep* *boop* --- ## [0.32.0](v0.31.0...v0.32.0) (2026-04-08) ### ⚠ BREAKING CHANGES * update repo name ([#2968](#2968)) ### Features * Add MCP tool annotations to all remaining tools ([#2221](#2221)) ([ea09db9](ea09db9)) * **bigquery:** Add conversational analytics tools for Data Agents ([#2517](#2517)) ([2490a4b](2490a4b)) * **embeddingModel:** Add Backend API selection fields ([#2592](#2592)) ([912aa9e](912aa9e)) * **skills:** Add Claude Code support to generated scripts ([#2966](#2966)) ([a1609e1](a1609e1)) * **skills:** Add codex user agent ([#2973](#2973)) ([070e939](070e939)) * **skills:** Tool invocation via npx ([#2916](#2916)) ([377dc5b](377dc5b)) * **sources/singlestore:** Add ConnectionParams to SingleStore Config ([#2555](#2555)) ([73e2a8c](73e2a8c)) * **tool/dataplex-lookup-context:** Relax project constraint and enforce location ([#2952](#2952)) ([7ebfdf1](7ebfdf1)) * **tools/looker:** Looker agent management from MCP ([#2830](#2830)) ([649d4ad](649d4ad)) * **ui:** Update to use `/mcp` endpoint ([#2829](#2829)) ([c3059c2](c3059c2)) ### Bug Fixes * **bigquery:** Add impersonateServiceAccount to prebuilt config ([#2770](#2770)) ([9c3a748](9c3a748)) * **quickstart:** Robust tool lookup and modernize dependencies in Python samples ([#2863](#2863)) ([4c0845d](4c0845d)) * **skills:** Fix skill generation template ([#2914](#2914)) ([a01a15e](a01a15e)) * **skills:** Prevent empty strings overriding optional env vars in node scripts ([#2963](#2963)) ([c52adeb](c52adeb)) * **tests/bigquery:** Implement uuid-based isolation and reliable resource cleanup ([#2547](#2547)) ([479d842](479d842)) * **tests/Bigtable:** Implement uuid-based isolation and reliable resource cleanup ([#2880](#2880)) ([a769f15](a769f15)) * Update error for ConvertConfig function ([#2993](#2993)) ([62bdabb](62bdabb)) ### Code Refactoring * Update repo name ([#2968](#2968)) ([3aae809](3aae809)) --- This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please). --------- Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com> Co-authored-by: Yuan Teoh <45984206+Yuan325@users.noreply.github.com> b9ae1c6

🤖 I have created a release *beep* *boop* --- ## [0.32.0](googleapis/mcp-toolbox@v0.31.0...v0.32.0) (2026-04-08) ### ⚠ BREAKING CHANGES * update repo name ([googleapis#2968](googleapis#2968)) ### Features * Add MCP tool annotations to all remaining tools ([googleapis#2221](googleapis#2221)) ([ea09db9](googleapis@ea09db9)) * **bigquery:** Add conversational analytics tools for Data Agents ([googleapis#2517](googleapis#2517)) ([2490a4b](googleapis@2490a4b)) * **embeddingModel:** Add Backend API selection fields ([googleapis#2592](googleapis#2592)) ([912aa9e](googleapis@912aa9e)) * **skills:** Add Claude Code support to generated scripts ([googleapis#2966](googleapis#2966)) ([a1609e1](googleapis@a1609e1)) * **skills:** Add codex user agent ([googleapis#2973](googleapis#2973)) ([070e939](googleapis@070e939)) * **skills:** Tool invocation via npx ([googleapis#2916](googleapis#2916)) ([377dc5b](googleapis@377dc5b)) * **sources/singlestore:** Add ConnectionParams to SingleStore Config ([googleapis#2555](googleapis#2555)) ([73e2a8c](googleapis@73e2a8c)) * **tool/dataplex-lookup-context:** Relax project constraint and enforce location ([googleapis#2952](googleapis#2952)) ([7ebfdf1](googleapis@7ebfdf1)) * **tools/looker:** Looker agent management from MCP ([googleapis#2830](googleapis#2830)) ([649d4ad](googleapis@649d4ad)) * **ui:** Update to use `/mcp` endpoint ([googleapis#2829](googleapis#2829)) ([c3059c2](googleapis@c3059c2)) ### Bug Fixes * **bigquery:** Add impersonateServiceAccount to prebuilt config ([googleapis#2770](googleapis#2770)) ([9c3a748](googleapis@9c3a748)) * **quickstart:** Robust tool lookup and modernize dependencies in Python samples ([googleapis#2863](googleapis#2863)) ([4c0845d](googleapis@4c0845d)) * **skills:** Fix skill generation template ([googleapis#2914](googleapis#2914)) ([a01a15e](googleapis@a01a15e)) * **skills:** Prevent empty strings overriding optional env vars in node scripts ([googleapis#2963](googleapis#2963)) ([c52adeb](googleapis@c52adeb)) * **tests/bigquery:** Implement uuid-based isolation and reliable resource cleanup ([googleapis#2547](googleapis#2547)) ([479d842](googleapis@479d842)) * **tests/Bigtable:** Implement uuid-based isolation and reliable resource cleanup ([googleapis#2880](googleapis#2880)) ([a769f15](googleapis@a769f15)) * Update error for ConvertConfig function ([googleapis#2993](googleapis#2993)) ([62bdabb](googleapis@62bdabb)) ### Code Refactoring * Update repo name ([googleapis#2968](googleapis#2968)) ([3aae809](googleapis@3aae809)) --- This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please). --------- Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com> Co-authored-by: Yuan Teoh <45984206+Yuan325@users.noreply.github.com> b9ae1c6

NirajNandre changed the title ~~fix(tests/bigquery): implement uuid-based isolation and reliable reso…~~ fix(tests/bigquery): implement uuid-based isolation and reliable resource cleanup Feb 23, 2026

gemini-code-assist bot reviewed Feb 23, 2026

View reviewed changes

tests/common.go Outdated Show resolved Hide resolved

NirajNandre added 4 commits March 24, 2026 09:42

fix(tests/bigquery): implement uuid-based isolation and reliable reso…

b30cf63

…urce cleanup

commenting the teardown and checking CleanupBigQueryDatasets()

05e38f4

uncommenting bigqueryapi import

a6ccc39

implement manual iteration of tables

d7b6f39

NirajNandre force-pushed the fix-bigquery-resource-cleanup branch from 6dd191f to d7b6f39 Compare March 26, 2026 07:24

Resolving merge conflict

c797bd0

Removed alias bigqueryapi

a742d84

NirajNandre force-pushed the fix-bigquery-resource-cleanup branch from 113aaac to a742d84 Compare March 26, 2026 12:52

Fix cleanup function by passing datasetName list

2cdfa16

NirajNandre force-pushed the fix-bigquery-resource-cleanup branch from 9785760 to 2cdfa16 Compare March 27, 2026 11:13

nit:Remove the unwanted comments and spaces

033098b

NirajNandre force-pushed the fix-bigquery-resource-cleanup branch from caa660b to 033098b Compare March 27, 2026 12:02

Merge branch 'main' into fix-bigquery-resource-cleanup

e2cd902

NirajNandre marked this pull request as ready for review March 27, 2026 12:12

NirajNandre requested review from a team as code owners March 27, 2026 12:12

blunderbuss-gcf bot assigned Yuan325 Mar 27, 2026

anubhav756 requested changes Mar 27, 2026

View reviewed changes

tests/bigquery/bigquery_integration_test.go Show resolved Hide resolved

tests/common.go Outdated Show resolved Hide resolved

nit fix comment in common.go

c6cc214

anubhav756 approved these changes Mar 27, 2026

View reviewed changes

anubhav756 assigned anubhav756 and unassigned Yuan325 Mar 27, 2026

anubhav756 merged commit 479d842 into googleapis:main Mar 27, 2026
15 checks passed

release-please bot mentioned this pull request Mar 27, 2026

chore(main): release 0.32.0 #2876

Merged

BrewTestBot mentioned this pull request Apr 8, 2026

mcp-toolbox 0.32.0 Homebrew/homebrew-core#276745

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

fix(tests/bigquery): implement uuid-based isolation and reliable resource cleanup#2547

fix(tests/bigquery): implement uuid-based isolation and reliable resource cleanup#2547
anubhav756 merged 10 commits intogoogleapis:mainfrom
NirajNandre:fix-bigquery-resource-cleanup

NirajNandre commented Feb 23, 2026 •

edited

Loading

Uh oh!

gemini-code-assist bot commented Feb 23, 2026

Uh oh!

gemini-code-assist bot left a comment

Uh oh!

Uh oh!

anubhav756 commented Mar 26, 2026

Uh oh!

anubhav756 commented Mar 26, 2026

Uh oh!

anubhav756 commented Mar 26, 2026

Uh oh!

anubhav756 commented Mar 27, 2026

Uh oh!

anubhav756 commented Mar 27, 2026

Uh oh!

anubhav756 commented Mar 27, 2026

Uh oh!

Uh oh!

Uh oh!

anubhav756 commented Mar 27, 2026

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

Conversation

NirajNandre commented Feb 23, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Description

Description of Changes:

Why it was required:

PR Checklist

Uh oh!

gemini-code-assist bot commented Feb 23, 2026

Summary of Changes

Highlights

Footnotes

Uh oh!

gemini-code-assist bot left a comment

Choose a reason for hiding this comment

Code Review

Uh oh!

Uh oh!

anubhav756 commented Mar 26, 2026

Uh oh!

anubhav756 commented Mar 26, 2026

Uh oh!

anubhav756 commented Mar 26, 2026

Uh oh!

anubhav756 commented Mar 27, 2026

Uh oh!

anubhav756 commented Mar 27, 2026

Uh oh!

anubhav756 commented Mar 27, 2026

Uh oh!

Uh oh!

Uh oh!

anubhav756 commented Mar 27, 2026

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

NirajNandre commented Feb 23, 2026 •

edited

Loading