Repository navigation
Conversation
This was referenced Sep 23, 2026
IvanBM18
added this pull request to stack #5497
September 25, 2026 01:44
IvanBM18
marked this pull request as ready for review
September 25, 2026 01:45
IvanBM18
force-pushed
the
better-tests/01a-metadata-emulator-configs
branch
from
September 28, 2026 16:54
321e5bc to
d26fa22
Compare
dylanjew
reviewed
Sep 29, 2026
IvanBM18
force-pushed
the
better-tests/01a-metadata-emulator-configs
branch
from
September 30, 2026 18:00
ce97852 to
762e923
Compare
IvanBM18
force-pushed
the
better-tests/01a-metadata-emulator-configs
branch
from
September 30, 2026 18:27
8cd19f0 to
1c35e7d
Compare
decoNR
approved these changes
Sep 30, 2026
| "preempted": "FALSE", | ||
| "scheduling": { | ||
| "preemptible": "FALSE", | ||
| "provisioning-model": "SPOT" |
Contributor
There was a problem hiding this comment.
Is preemptible = False and provisioning-model = SPOT correct?
Collaborator
There was a problem hiding this comment.
I would try to match what we have on prod. Is that different than SPOT?
Collaborator
Author
There was a problem hiding this comment.
The metadata server does return FALSE & TRUE, don't know why but thats what it does.
MB "SPOT" is used with preemptible VMs, so if we want to match what a non pre-emptible bot has this should be STANDARD, Changing it!
decoNR
reviewed
Sep 30, 2026
dylanjew
approved these changes
Sep 30, 2026
IvanBM18
force-pushed
the
better-tests/01a-metadata-emulator-configs
branch
from
October 2, 2026 17:12
32fca30 to
dddad9c
Compare
Adds the JSON fixtures the WireMock metadata emulator serves: a tworker
and a uworker identity, plus an annotated template describing the shape
of a fixture.
The shape mirrors the real metadata server's hierarchy, so a fixture can
be written by reading a live instance:
curl -H 'Metadata-Flavor: Google' \
'http://metadata.google.internal/computeMetadata/v1/?recursive=true'
template.json is documentation rather than a loadable fixture: it keeps
its // comments, and nothing parses it.
IvanBM18
force-pushed
the
better-tests/01a-metadata-emulator-configs
branch
from
October 6, 2026 22:19
dddad9c to
2c93536
Compare
IvanBM18
added a commit
that referenced
this pull request
Oct 6, 2026
Bug: b/555370359 We can redirect `google-auth` metadata requests to a local emulator via the `GCE_METADATA_HOST` environment variable, but ClusterFuzz's own `compute_metadata.py` previously hardcoded `metadata.google.internal` and port `80`. Reading `GCE_METADATA_HOST` and parsing optional ports allows local integration tests to run a metadata emulator on an ephemeral unprivileged port without root privileges or `/etc/hosts` changes. ## Changes - Update `_METADATA_SERVER` in `compute_metadata.py` to read `GCE_METADATA_HOST` from the environment, falling back to `metadata.google.internal`. - Add unit tests in covering `_metadata_host_port()`, `is_gce()` on non-default ports, and `GCE_METADATA_HOST` overrides. ### 📚 Stacked PRs | Step | PR | Title | Base Branch | | :---: | :--- | :--- | :--- | | 0 | #5475 | `[Better Tests] Adds new test dependencies` | `master` | | **1** | **#5479** | **`[Better Tests] Support GCE_METADATA_HOST with port in compute_metadata`** *(👉 This PR)* | `better-test/dependencies` | | 2 | #5485 | `[Better Tests] Add GCE metadata emulator worker fixtures` | `better-tests/01-compute-metadata-host` | | 3 | #5480 | `[Better Tests] Add the WireMock GCE metadata emulator` | `better-tests/01a-metadata-emulator-configs` | | 4 | #5486 | `[Better Tests] Bootstrap and cover the GCE metadata emulator` | `better-tests/02-metadata-emulator-core` | | 5 | #5481 | `[Better Tests] Add fault injection and runtime overrides to metadata emulator` | `better-tests/02a-metadata-emulator-tests` |
IvanBM18
added a commit
that referenced
this pull request
Oct 6, 2026
Bug: b/555370359
Creates a GCE metadata emulator for our future integration test suite,
built on Testcontainers and WireMock. It lets tests resolve credentials
and read instance and project metadata without a real GCE host or a
local `gcloud` login, and lets them distinguish a trusted from an
untrusted environment.
`google-auth` and our vendored `oauth2client` evaluate the
`GCE_METADATA_*` environment variables once, at import time, and bake
the resulting URL in. Importing this module therefore claims two
loopback addresses up front; the addresses never move, only what listens
on them does. A test picks its in-process identity by picking which
fixture answers on the default address:
```python
with gce_metadata_emulator.trusted_as_default() as tworker:
...
with gce_metadata_emulator.untrusted_as_default() as uworker:
...
with gce_metadata_emulator.trusted_untrusted_pair() as (tworker, uworker):
... # uworker sits on the secondary address
```
Nothing is patched to make that work. An emulator on the secondary
address is reachable through the client its context manager yields, or
by handing its env to a child process:
```python
subprocess.run(argv, env={**os.environ, **uworker.env})
```
This emulator was based off the pre-existing [local emulator go
wrap](https://github.com/google/clusterfuzz/blob/master/local/emulators/metadata.go)
+ what is detailed at the [GCP metadata server
docs](https://docs.cloud.google.com/compute/docs/metadata/overview)
## Changes
- Add `gce_metadata_emulator.py`, a WireMock Testcontainer fake GCE
metadata server. Supports:
- Serving fake service account credentials, so a test can tell a trusted
from an untrusted environment.
- Serving project- and instance-scoped metadata values, including
attribute shadowing, seeded from the JSON configs added in #5485.
- Rejecting requests that omit `Metadata-Flavor: Google`, the way the
real server does.
- Failing loudly when two emulators want the same address.
The tests covering all of this land in #5486, next in the stack.
### 📚 Stacked PRs
| Step | PR | Title | Base Branch |
| :---: | :--- | :--- | :--- |
| 0 | #5475 | `[Better Tests] Adds new test dependencies` | `master` |
| 1 | #5479 | `[Better Tests] Support GCE_METADATA_HOST with port in
compute_metadata` | `better-test/dependencies` |
| 2 | #5485 | `[Better Tests] Add GCE metadata emulator worker fixtures`
| `better-tests/01-compute-metadata-host` |
| **3** | **#5480** | **`[Better Tests] Add the WireMock GCE metadata
emulator`** *(👉 This PR)* | `better-tests/01a-metadata-emulator-configs`
|
| 4 | #5486 | `[Better Tests] Bootstrap and cover the GCE metadata
emulator` | `better-tests/02-metadata-emulator-core` |
| 5 | #5481 | `[Better Tests] Add fault injection and runtime overrides
to metadata emulator` | `better-tests/02a-metadata-emulator-tests` |
IvanBM18
added a commit
that referenced
this pull request
Oct 6, 2026
Bug: b/555370359 Split out of #5480. This PR wires the GCE metadata emulator added in #5480 into the test runner, and covers it. ## Note - This is the first of many integration test modules, for this purpose, it uses `pytest` library instead of `unittest`, this requires different syntax for asserting, but files & methods naming is basically the same. - This is a experimental integration test module, still a standalone, we require to wire a couple of things with a butler command to allow easy execution of this kind of tests like we do with unit test, this will be done in a subsequent bug: b/540876792 - Documentation will be created in b/555424439 once we have our first set of integration test suites & the butler command is ready to run them - I aim to create documentation & guidelines to be created based off this first tests and overall the discussion we have in the PRs for them, so feel free to push back on even the smallest details, nothing is set in stone! ## Changes - Adds `gce_metadata_emulator_test.py`, skipped right now because its experimental, just in case this ends in the CI process before we intended to. ## Tests - `GceMetadataEmulatorTest` an integration test for how some common workflows behave using the new emulator, runs a trusted and an untrusted emulator side by side and verifies: - `GceMetadataEmulatorUntrustedDefaultTest` puts a metadata server that returns uworker on the default address and verifies that all resolve to the untrusted identity. To run it: ``` PYTHONPATH=src:src/third_party pytest test_suites/fixtures/gce_metadata_server_test.py ``` We need to later include them in `butler.py` so that we can: - Run them smoothly - Don't require to do the imports manually But theres already a bug for that, and the purpose of this is not creating the butler setup but to create an emulator for other tests. ### 📚 Stacked PRs | Step | PR | Title | Base Branch | | :---: | :--- | :--- | :--- | | 0 | #5475 | `[Better Tests] Adds new test dependencies` | `master` | | 1 | #5479 | `[Better Tests] Support GCE_METADATA_HOST with port in compute_metadata` | `better-test/dependencies` | | 2 | #5485 | `[Better Tests] Add GCE metadata emulator worker fixtures` | `better-tests/01-compute-metadata-host` | | 3 | #5480 | `[Better Tests] Add the WireMock GCE metadata emulator` | `better-tests/01a-metadata-emulator-configs` | | **4** | **#5486** | **`[Better Tests] Bootstrap and cover the GCE metadata emulator`** *(👉 This PR)* | `better-tests/02-metadata-emulator-core` | | 5 | #5481 | `[Better Tests] Add fault injection and runtime overrides to metadata emulator` | `better-tests/02a-metadata-emulator-tests` |
IvanBM18
added a commit
that referenced
this pull request
Oct 6, 2026
…data fake values (#5481) Bug: b/555370359 Following the parent PR, this one introduces changes for our emulator so that we can force it to fail either constantly, or on demand, this opens a ton of possibilities for integration tests, this is technically also a new feature, but to simplify reviews i moved this one to a separate PR. With this changes it now simulates transient GCE metadata server failures (such as HTTP 500s or latency spikes) and mutate instance/project attributes dynamically during a test without restarting the WireMock container. Using WireMock stateful scenarios allows injecting faults that automatically expire after N requests so retry decorators (such as `@retry.wrap` on `compute_metadata.get()`) can be tested deterministically. ## Changes - Adds an interface(for composition instead of inheritance) for so that we can inject fault mapping to any API that uses wiremock as its base starting with the metadata_emulator. - Track runtime instance attribute overrides via `_runtime_instance_attributes` so `set_project_attribute()` does not overwrite attributes shadowed at runtime, and reset them in `clear_faults()`. - Adds tests cases for this. ### 📚 Stacked PRs | Step | PR | Title | Base Branch | | :---: | :--- | :--- | :--- | | 0 | #5475 | `[Better Tests] Adds new test dependencies` | `master` | | 1 | #5479 | `[Better Tests] Support GCE_METADATA_HOST with port in compute_metadata` | `better-test/dependencies` | | 2 | #5485 | `[Better Tests] Add GCE metadata emulator worker fixtures` | `better-tests/01-compute-metadata-host` | | 3 | #5480 | `[Better Tests] Add the WireMock GCE metadata emulator` | `better-tests/01a-metadata-emulator-configs` | | 4 | #5486 | `[Better Tests] Bootstrap and cover the GCE metadata emulator` | `better-tests/02-metadata-emulator-core` | | **5** | **#5481** | **`[Better Tests] Add fault injection and runtime overrides to metadata emulator`** *(👉 This PR)* | `better-tests/02a-metadata-emulator-tests` |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Bug: b/555370359
Split out of #5480, which had grown to 821 lines across the fixtures, the emulator that serves them, and the tests that exercise it.
This PR is the data half: the JSON configs the GCE metadata emulator seeds itself from. Each config describes one worker identity, so a test can pick whether it runs trusted or untrusted by picking which fixture answers on the default address.
The shape of
metadatamirrors the real metadata server's hierarchy, so a config can be retrieved by reading a live instance:Changes
local/emulators/configs/tworker.json: the trusted worker identity, with its service account email, scopes, a fake access token, and the project and instance metadata a tworker reads.local/emulators/configs/uworker.json: the untrusted counterpart, so both can run side by side and be shown to stay distinct.local/emulators/configs/template.json: an annotated reference for writing a new config. It is documentation rather than a loadable fixture, so it keeps its//comments; nothing parses it.tworker.jsonanduworker.jsonare plain JSON and are the only two loaded.Nothing reads these yet. The emulator that serves them is #5480, next in the stack.
📚 Stacked PRs
[Better Tests] Adds new test dependenciesmaster[Better Tests] Support GCE_METADATA_HOST with port in compute_metadatabetter-test/dependencies[Better Tests] Add GCE metadata emulator worker fixtures(👉 This PR)better-tests/01-compute-metadata-host[Better Tests] Add the WireMock GCE metadata emulatorbetter-tests/01a-metadata-emulator-configs[Better Tests] Bootstrap and cover the GCE metadata emulatorbetter-tests/02-metadata-emulator-core[Better Tests] Add fault injection and runtime overrides to metadata emulatorbetter-tests/02a-metadata-emulator-tests