Merge remote-tracking branch 'origin/wine' into barolo-seed

mk2023 · mk2023 · commit d67d88dffe77 · 2026-08-03T14:11:01.000-07:00
diff --git a/firebase_admin/dataconnect.py b/firebase_admin/dataconnect.py
@@ -465,6 +465,9 @@ def _get_headers(self) -> Dict[str, str]:
             "X-Firebase-Client": f"fire-admin-python/{firebase_admin.__version__}",
             "x-goog-api-client": _utils.get_metrics_header(),
             "X-Client-Version": f"python/{firebase_admin.__version__}",
+            "X-Firebase-Sqlconnect-Affinity": (
+                f"{self._project_id}{self._connector_config.service_id}"
+            ),
         }
 
     @staticmethod
diff --git a/tests/test_data_connect.py b/tests/test_data_connect.py
@@ -703,6 +703,7 @@ def test_get_headers(self):
         assert headers.get("X-Firebase-Client") == f"fire-admin-python/{firebase_admin.__version__}"
         assert headers.get("x-goog-api-client") == _utils.get_metrics_header()
         assert headers.get("X-Client-Version") == f"python/{firebase_admin.__version__}"
+        assert headers.get("X-Firebase-Sqlconnect-Affinity") == "test-projectstarterproject"
 
 
 class TestDataConnectApiClientMakeGqlRequest:

Original file line number	Diff line number	Diff line change
`@@ -465,6 +465,9 @@ def _get_headers(self) -> Dict[str, str]:`
`465`	`465`	`"X-Firebase-Client": f"fire-admin-python/{firebase_admin.__version__}",`
`466`	`466`	`"x-goog-api-client": _utils.get_metrics_header(),`
`467`	`467`	`"X-Client-Version": f"python/{firebase_admin.__version__}",`
	`468`	`+ "X-Firebase-Sqlconnect-Affinity": (`
	`469`	`+ f"{self._project_id}{self._connector_config.service_id}"`
	`470`	`+ ),`
`468`	`471`	`}`
`469`	`472`
`470`	`473`	`@staticmethod`