Skip to content

fix: preserve multi-digit GCP region numbers #1439

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
nawaaaaaAaar wants to merge 2 commits into
base: master
Choose a base branch
from
Open

fix: preserve multi-digit GCP region numbers #1439

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0318dda
Preserve multi-digit GCP region numbers
nawaaaaaAaar Oct 5, 2026
a89ef2c
Merge branch 'master' into fix/gcp-region-numbers
davidberenstein1957 Oct 9, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion codecarbon/external/geography.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ def extract_gcp_region(zone: str) -> str:
"""
projects/705208488469/zones/us-central1-a -> us-central1
"""
google_region_regex = r"[a-z]+-[a-z]+[0-9]"
google_region_regex = r"[a-z]+-[a-z]+[0-9]+"
return re.search(google_region_regex, zone).group(0)

extract_region_for_provider: Dict[str, Callable] = {
Expand Down
15 changes: 15 additions & 0 deletions tests/test_geography.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import unittest
from unittest import mock

import pytest
import responses

from codecarbon.external.geography import CloudMetadata, GeoMetadata
Expand All @@ -15,6 +16,20 @@
)


@pytest.mark.parametrize(
"region", ["europe-west12", "europe-west10", "us-central1", "asia-northeast3"]
)
@pytest.mark.parametrize("prefix", ["", "projects/123/zones/"])
def test_cloud_metadata_gcp_region_number(region, prefix):
metadata = {"provider": "gcp", "metadata": {"zone": f"{prefix}{region}-a"}}
with mock.patch(
"codecarbon.external.geography.get_env_cloud_details", return_value=metadata
):
cloud = CloudMetadata.from_utils()
assert cloud.provider == "gcp"
assert cloud.region == region


class TestCloudMetadata(unittest.TestCase):
@mock.patch(
"codecarbon.external.geography.get_env_cloud_details",
Expand Down
Loading