Merge pull request #41 from codefly-dev/fix/test-container-ownership

Fix FastAPI release qualification and generated scaffold lint

Author: antoinetoussaint-byte

agent.codefly.yaml

@@ -2,3 +2,6 @@ publisher: codefly.dev
 kind: codefly:service
 name: python-fastapi
 version: 0.0.100
+source:
+  directory: .
+  agent: codefly.dev/go:0.0.51

destroy_test.go

@@ -297,6 +297,7 @@ func TestResolveRuntimeImageHonorsOverride(t *testing.T) {
 // that is the shape `codefly` shutdown reaches when Init never ran in this
 // process, and the only path on which Destroy reaches the container by name.
 func TestDestroyRemovesContainerBeforeClearingCache(t *testing.T) {
+	ownTestContainers(t)
 	ctx := context.Background()
 
 	// Docker on macOS only bind-mounts shared paths, and the per-user temp dir

lifecycle_matrix_test.go

@@ -10,7 +10,9 @@ import (
 
 	"github.com/codefly-dev/core/resources"
 	runners "github.com/codefly-dev/core/runners/base"
+	"github.com/codefly-dev/core/runners/dockerrun"
 	"github.com/codefly-dev/core/runners/testmatrix"
+	"github.com/stretchr/testify/require"
 )
 
 // TestPythonFastAPILifecycle_Matrix exercises python-fastapi's parity
@@ -19,6 +21,14 @@ import (
 // (main.go `runtimeImage`). Nix + native rely on host's python3 via PATH
 // or flake.nix respectively.
 func TestPythonFastAPILifecycle_Matrix(t *testing.T) {
+	// The test binary owns its containers independently of the source-test launcher.
+	root := t.TempDir()
+	scope, err := dockerrun.NewContainerRecoveryScope(root, root, t.Name())
+	require.NoError(t, err)
+	t.Setenv(dockerrun.ContainerRecoveryScopeEnvironment, os.Getenv(dockerrun.ContainerRecoveryScopeEnvironment))
+	require.NoError(t, dockerrun.SetContainerRecoveryScope(scope))
+	require.NotEmpty(t, dockerrun.InheritedContainerRecoveryScope())
+
 	dir, err := os.MkdirTemp("", "pyfastapi-matrix-*")
 	if err != nil {
 		t.Fatalf("mkdtemp: %v", err)

main_test.go

@@ -20,6 +20,7 @@ import (
 	builderv0 "github.com/codefly-dev/core/generated/go/codefly/services/builder/v0"
 
 	"github.com/codefly-dev/core/resources"
+	"github.com/codefly-dev/core/runners/dockerrun"
 
 	basev0 "github.com/codefly-dev/core/generated/go/codefly/base/v0"
 )
@@ -31,6 +32,7 @@ func TestCreateToRunNative(t *testing.T) {
 }
 
 func TestCreateToRunDocker(t *testing.T) {
+	ownTestContainers(t)
 	testCreateToRun(t, resources.NewRuntimeContextContainer())
 }
 
@@ -166,3 +168,15 @@ func testRun(t *testing.T, runtime *Runtime, ctx context.Context, identity *base
 		break
 	}
 }
+
+// Source tests run below the agent process, so its recovery marker is not ours.
+// Give test-owned resources a new isolated scope; never remove the ownership check.
+func ownTestContainers(t *testing.T) {
+	t.Helper()
+	root := t.TempDir()
+	scope, err := dockerrun.NewContainerRecoveryScope(root, root, t.Name())
+	require.NoError(t, err)
+	t.Setenv(dockerrun.ContainerRecoveryScopeEnvironment, os.Getenv(dockerrun.ContainerRecoveryScopeEnvironment))
+	require.NoError(t, dockerrun.SetContainerRecoveryScope(scope))
+	require.NotEmpty(t, dockerrun.InheritedContainerRecoveryScope())
+}

templates/factory/code/src/admin/router.py.tmpl

@@ -1,10 +1,11 @@
 from fastapi import APIRouter
 
-from src.admin.version import get_version
 from src.admin.models import Version
+from src.admin.version import get_version
 
 router = APIRouter()
 
+
 @router.get("/version", response_model=Version)
 async def version():
     return get_version()

templates/factory/code/src/admin/version.py.tmpl

@@ -1,5 +1,7 @@
-import codefly_sdk.codefly as codefly
+from codefly_sdk import codefly
+
 from src.admin.models import Version
 
+
 def get_version() -> Version:
     return Version(version=codefly.get_version())

templates/factory/code/src/framework/plugin.py.tmpl

@@ -1,5 +1,5 @@
+from collections.abc import Callable
 from dataclasses import dataclass, field
-from typing import Optional, Callable
 
 from fastapi import APIRouter
 
@@ -16,6 +16,6 @@ class Plugin:
     router: APIRouter
     prefix: str = ""
     tags: list[str] = field(default_factory=list)
-    startup: Optional[Callable] = None
-    shutdown: Optional[Callable] = None
+    startup: Callable | None = None
+    shutdown: Callable | None = None
     migrations: list[str] = field(default_factory=list)

templates/factory/code/src/main.py.tmpl

@@ -1,8 +1,8 @@
 import os
 
+from codefly_sdk import codefly
 from fastapi import FastAPI
 from fastapi.middleware.cors import CORSMiddleware
-import codefly_sdk.codefly as codefly
 
 
 def _service_manifest_reachable() -> bool:
@@ -38,8 +38,10 @@ app.add_middleware(
     allow_headers=["*"],
 )
 
+# Initialize configuration before importing routes or user-provided plugins.
 # Routes
 from src.admin.router import router as admin
+
 app.include_router(admin)
 
 # Plugins

templates/factory/code/src/openapi.py.tmpl

@@ -3,11 +3,11 @@
 import json
 import os
 
-from src.main import app
-
-import codefly_sdk.codefly as codefly
+from codefly_sdk import codefly
 from fastapi.openapi.utils import get_openapi
 
+from src.main import app
+
 if __name__ == "__main__":
     current_file_path = os.path.abspath(__file__)
     openapi_dir = os.path.abspath(os.path.join(current_file_path, "../../../openapi"))

templates/factory/code/tests/admin/test_admin.py.tmpl

@@ -10,17 +10,18 @@ os.environ.setdefault("CODEFLY__SERVICE", "svc")
 os.environ.setdefault("CODEFLY__SERVICE_VERSION", "0.0.0")
 
 import pytest
-from httpx import AsyncClient, ASGITransport
+from httpx import ASGITransport, AsyncClient
 
-from src.main import app
-
-from src.admin.version import get_version
 from src.admin.models import Version
+from src.admin.version import get_version
+from src.main import app
 
 
 @pytest.mark.asyncio
 async def test_version():
-    async with AsyncClient(transport=ASGITransport(app=app), base_url="http://localhost:8080") as ac:
+    async with AsyncClient(
+        transport=ASGITransport(app=app), base_url="http://localhost:8080"
+    ) as ac:
         response = await ac.get("/version")
     assert response.status_code == 200