intermittent commit

dev/connectors/smoke.py

@@ -18,16 +18,17 @@ ROOT = Path(__file__).resolve().parent
 def main() -> int:
     parser = argparse.ArgumentParser(description="Smoke-test GovOPlaN connector helpers against the local dev compose stack.")
     parser.add_argument("--require-smb", action="store_true", help="Fail if the SMB connector cannot browse/import.")
+    parser.add_argument("--require-s3", action="store_true", help="Fail if the S3 connector cannot browse/import.")
     parser.add_argument("--debug-smb", action="store_true", help="Print direct smbclient probes before the connector smoke check.")
     args = parser.parse_args()
 
     _load_dotenv()
     _default_env()
-    preflight_failures = _preflight_services(require_smb=args.require_smb)
+    preflight_failures = _preflight_services(require_smb=args.require_smb, require_s3=args.require_s3)
     if preflight_failures:
         for failure in preflight_failures:
             print(f"FAIL {failure}")
-        print("Start or recreate the connector stack from this directory with: docker compose up -d nextcloud nextcloud-db webdav smb")
+        print("Start or recreate the connector stack from this directory with: docker compose up -d nextcloud nextcloud-db webdav smb minio")
         return 1
     _seed_webdav_fixture()
     _seed_smb_fixture()
@@ -36,6 +37,13 @@ def main() -> int:
     except httpx.HTTPError as exc:
         print(f"FAIL dev-nextcloud seed failed: {exc}")
         return 1
+    try:
+        _seed_s3_fixture()
+    except Exception as exc:
+        if args.require_s3:
+            print(f"FAIL dev-s3 seed failed: {exc}")
+            return 1
+        print(f"SKIP dev-s3 seed failed: {exc}")
 
     profiles = {profile.id: profile for profile in connector_profiles_from_payload({"profiles": _profile_payloads()})}
     if args.debug_smb:
@@ -59,6 +67,15 @@ def main() -> int:
         else:
             print(f"SKIP {message}")
 
+    try:
+        _exercise_profile(profiles["dev-s3"], folder="GovOPlaN", file_path="GovOPlaN/s3-live.txt", expected="s3 live fixture")
+    except Exception as exc:
+        message = f"dev-s3: {exc}"
+        if args.require_s3:
+            failures.append(message)
+        else:
+            print(f"SKIP {message}")
+
     if failures:
         for failure in failures:
             print(f"FAIL {failure}")
@@ -76,6 +93,9 @@ def _default_env() -> None:
         "SMB_SHARE_NAME": "files",
         "SMB_USER": "govoplan",
         "SMB_PASSWORD": "govoplan-smb",
+        "MINIO_ROOT_USER": "govoplan",
+        "MINIO_ROOT_PASSWORD": "govoplan-minio",
+        "MINIO_BUCKET": "govoplan",
     }
     for key, value in defaults.items():
         os.environ.setdefault(key, value)
@@ -96,7 +116,7 @@ def _load_dotenv() -> None:
         os.environ[key] = value.strip().strip("\"'")
 
 
-def _preflight_services(*, require_smb: bool) -> list[str]:
+def _preflight_services(*, require_smb: bool, require_s3: bool) -> list[str]:
     failures: list[str] = []
     nextcloud_url = f"http://127.0.0.1:{os.getenv('NEXTCLOUD_HOST_PORT', '9081')}/status.php"
     try:
@@ -121,6 +141,14 @@ def _preflight_services(*, require_smb: bool) -> list[str]:
                 pass
         except OSError as exc:
             failures.append(f"dev-smb is not reachable at 127.0.0.1:{smb_port}: {exc}")
+    if require_s3:
+        minio_url = f"http://127.0.0.1:{os.getenv('MINIO_API_HOST_PORT', '9000')}/minio/health/live"
+        try:
+            response = httpx.get(minio_url, timeout=3.0)
+            if response.status_code != 200:
+                failures.append(f"dev-s3 expected HTTP 200 at {minio_url}, got HTTP {response.status_code}")
+        except httpx.HTTPError as exc:
+            failures.append(f"dev-s3 is not reachable at {minio_url}: {exc}")
     return failures
 
 
@@ -150,6 +178,20 @@ def _profile_payloads() -> list[dict[str, object]]:
             "username": os.getenv("SMB_USER", "govoplan"),
             "password_env": "SMB_PASSWORD",
         },
+        {
+            "id": "dev-s3",
+            "provider": "s3",
+            "endpoint_url": f"http://127.0.0.1:{os.getenv('MINIO_API_HOST_PORT', '9000')}",
+            "credential_mode": "basic",
+            "username": os.getenv("MINIO_ROOT_USER", "govoplan"),
+            "password_env": "MINIO_ROOT_PASSWORD",
+            "metadata": {
+                "bucket": os.getenv("MINIO_BUCKET", "govoplan"),
+                "region": "us-east-1",
+                "path_style": True,
+                "verify_tls": False,
+            },
+        },
     ]
 
 
@@ -211,5 +253,30 @@ def _seed_nextcloud_fixture() -> None:
         raise RuntimeError(f"Nextcloud PUT failed with HTTP {response.status_code}: {response.text[:200]}")
 
 
+def _seed_s3_fixture() -> None:
+    try:
+        import boto3
+        from botocore.config import Config
+        from botocore.exceptions import ClientError
+    except ImportError as exc:
+        raise RuntimeError("boto3 is not installed; install govoplan-files[s3]") from exc
+    bucket = os.getenv("MINIO_BUCKET", "govoplan")
+    client = boto3.client(
+        "s3",
+        endpoint_url=f"http://127.0.0.1:{os.getenv('MINIO_API_HOST_PORT', '9000')}",
+        aws_access_key_id=os.getenv("MINIO_ROOT_USER", "govoplan"),
+        aws_secret_access_key=os.getenv("MINIO_ROOT_PASSWORD", "govoplan-minio"),
+        region_name="us-east-1",
+        config=Config(s3={"addressing_style": "path"}),
+    )
+    try:
+        client.create_bucket(Bucket=bucket)
+    except ClientError as exc:
+        code = exc.response.get("Error", {}).get("Code")
+        if code not in {"BucketAlreadyOwnedByYou", "BucketAlreadyExists"}:
+            raise
+    client.put_object(Bucket=bucket, Key="GovOPlaN/s3-live.txt", Body=b"s3 live fixture\n", ContentType="text/plain")
+
+
 if __name__ == "__main__":
     raise SystemExit(main())