Merge branch 'main' into feat-tos-read-write-delete

Author: ddupg

.github/scripts/test_behavior/plan.py

@@ -35,6 +35,14 @@
 
 INTEGRATIONS = ["object_store"]
 
+TEMPORARILY_DISABLED_CORE_SERVICES = {
+    # FIXME: Re-enable gdrive behavior tests after #7384 is fixed.
+    # Gdrive is currently not reliable enough for CI: #6684 tracks missing
+    # freshly-created entries in listings, and existing behavior tests already
+    # document redirect loops caused by Google Drive abuse detection.
+    "gdrive",
+}
+
 
 def provided_cases() -> list[dict[str, str]]:
     root_dir = f"{GITHUB_DIR}/services"
@@ -59,6 +67,10 @@ def provided_cases() -> list[dict[str, str]]:
     if not os.getenv("GITHUB_HAS_SECRETS") == "true":
         cases[:] = [v for v in cases if "op://services" not in v["content"]]
 
+    cases[:] = [
+        v for v in cases if v["service"] not in TEMPORARILY_DISABLED_CORE_SERVICES
+    ]
+
     # Remove content from cases.
     cases = [
         {

.github/scripts/test_behavior/test_plan.py

@@ -16,6 +16,7 @@
 # under the License.
 
 import unittest
+from unittest.mock import patch
 
 from plan import plan
 
@@ -74,6 +75,23 @@ def test_integration_object_store(self):
         # Should contain fs
         self.assertTrue("fs" in cases)
 
+    @patch.dict("os.environ", {"GITHUB_HAS_SECRETS": "true"}, clear=False)
+    def test_gdrive_is_temporarily_disabled(self):
+        result = plan([".github/workflows/test_behavior.yml"])
+
+        self.assertTrue(result["components"]["core"])
+        core_cases = [v["service"] for target in result["core"] for v in target["cases"]]
+        self.assertFalse("gdrive" in core_cases)
+
+        for language in ["java", "python", "nodejs", "go", "c", "cpp", "dotnet"]:
+            self.assertTrue(result["components"][f"binding_{language}"])
+            binding_cases = [
+                v["service"]
+                for target in result[f"binding_{language}"]
+                for v in target["cases"]
+            ]
+            self.assertFalse("gdrive" in binding_cases)
+
 
 if __name__ == "__main__":
     unittest.main()