Merge deployed browser identity fix (#110)

Author: alexeygrigorev

_docs/compatibility/development-terminology-allowlist.json

@@ -188,7 +188,7 @@
     },
     {
       "path": "core/tests/test_web_runtime_coherence.py",
-      "sha256": "86df3fa207903358007ca37a4278dda0daea5c632bc7142da1550e46c72095a7",
+      "sha256": "323e7093630ecfa0109d6a605328f5f4497a49203b408983ff69fd9d9c9eee81",
       "class": "legacy_contract_test",
       "reason": "Web runtime coherence tests exercise the exact development service, task, target, and repository identifiers.",
       "follow_up": "#94",

core/tests/test_web_runtime_coherence.py

@@ -10,6 +10,7 @@
 
 from django.test import SimpleTestCase
 
+from core.runtime_identity import read_runtime_identity
 from deploy.aws_gateway import AwsReleaseConfig, AwsReleaseGateway
 from deploy.contracts import (
     ReleaseContractError,
@@ -292,6 +293,50 @@ def observed_binding() -> WebRuntimeBinding:
 
 
 class WebRuntimeCoherenceTests(SimpleTestCase):
+    def test_deployed_browser_smoke_receives_complete_runtime_identity(self) -> None:
+        gateway = AwsReleaseGateway.__new__(AwsReleaseGateway)
+        gateway.config = config()
+        observed: dict[str, Any] = {}
+
+        def collect_subprocess(
+            command: list[str],
+            *,
+            check: bool,
+            env: dict[str, str],
+            timeout: int,
+        ) -> None:
+            observed.update(
+                command=command,
+                check=check,
+                env=env,
+                timeout=timeout,
+                runtime_identity=read_runtime_identity(env),
+            )
+
+        workflow_environment = {
+            "VERSION": VERSION,
+            "IMAGE_DIGEST": IMAGE_DIGEST,
+            "RELEASE_SHA": SOURCE_SHA,
+        }
+        with (
+            patch.dict("os.environ", workflow_environment, clear=True),
+            patch("deploy.aws_gateway.run_http_smoke"),
+            patch("deploy.aws_gateway.subprocess.run", side_effect=collect_subprocess),
+        ):
+            gateway.run_deployed_smoke(identity())
+
+        runtime_identity = observed["runtime_identity"]
+        self.assertEqual(runtime_identity.version, VERSION)
+        self.assertEqual(runtime_identity.source_sha, SOURCE_SHA)
+        self.assertEqual(runtime_identity.image_digest, IMAGE_DIGEST)
+        environment = cast(dict[str, str], observed["env"])
+        self.assertEqual(environment["VERSION"], VERSION)
+        self.assertEqual(environment["SOURCE_SHA"], SOURCE_SHA)
+        self.assertEqual(environment["IMAGE_DIGEST"], IMAGE_DIGEST)
+        self.assertEqual(environment["DTC_EXPECTED_VERSION"], VERSION)
+        self.assertEqual(environment["DTC_EXPECTED_SOURCE_SHA"], SOURCE_SHA)
+        self.assertEqual(environment["DTC_EXPECTED_IMAGE_DIGEST"], IMAGE_DIGEST)
+
     def test_eventual_visibility_freezes_two_samples_around_public_health(self) -> None:
         events: list[str] = []
         clock = FakeClock()

deploy/aws_gateway.py

@@ -2543,6 +2543,9 @@ def run_deployed_smoke(self, identity: ReleaseIdentity) -> None:
                 check=True,
                 env={
                     **os.environ,
+                    "VERSION": identity.version,
+                    "SOURCE_SHA": identity.source_sha,
+                    "IMAGE_DIGEST": identity.image_digest,
                     "DTC_TEST_BASE_URL": self.config.base_url,
                     "DTC_EXPECTED_VERSION": identity.version,
                     "DTC_EXPECTED_SOURCE_SHA": identity.source_sha,