update

AxaFrance · Jun 19, 2024 · 41c5112 · 41c5112
1 parent f8cc3a7
commit 41c5112
Showing 1 changed file with 36 additions and 12 deletions.
diff --git a/src/SlimFaas/SlimProxyMiddleware.cs b/src/SlimFaas/SlimProxyMiddleware.cs
@@ -15,14 +15,20 @@ public enum FunctionType
     NotAFunction
 }
 
-public record FunctionStatus(int NumberReady, int NumberRequested);
+public record FunctionStatus(int NumberReady, int NumberRequested, PodType PodType, FunctionVisibility Visibility);
 
 [JsonSerializable(typeof(FunctionStatus))]
 [JsonSourceGenerationOptions(WriteIndented = false, DefaultIgnoreCondition = JsonIgnoreCondition.WhenWritingNull)]
 public partial class FunctionStatusSerializerContext : JsonSerializerContext
 {
 }
 
+[JsonSerializable(typeof(List<FunctionStatus>))]
+[JsonSourceGenerationOptions(WriteIndented = false, DefaultIgnoreCondition = JsonIgnoreCondition.WhenWritingNull)]
+public partial class ListFunctionStatusSerializerContext : JsonSerializerContext
+{
+}
+
 public class SlimProxyMiddleware(RequestDelegate next, ISlimFaasQueue slimFaasQueue, IWakeUpFunction wakeUpFunction,
     ILogger<SlimProxyMiddleware> logger,
     int timeoutWaitWakeSyncFunctionMilliSecond =
@@ -57,10 +63,23 @@ public async Task InvokeAsync(HttpContext context,
             return;
         }
 
+
+
         HttpRequest contextRequest = context.Request;
-        (string functionPath, string functionName, FunctionType functionType) = GetFunctionInfo(logger, contextRequest);
         HttpResponse contextResponse = context.Response;
 
+        if(contextRequest.Path.StartsWithSegments("/status-functions"))
+        {
+            IList<FunctionStatus> functionStatuses = replicasService.Deployments.Functions.Select(MapToFunctionStatus).ToList();
+            await contextResponse.WriteAsJsonAsync(functionStatuses,
+                ListFunctionStatusSerializerContext.Default.ListFunctionStatus);
+            context.Response.StatusCode = 200;
+            return;
+        }
+
+        (string functionPath, string functionName, FunctionType functionType) = GetFunctionInfo(logger, contextRequest);
+
+
         switch (functionType)
         {
             case FunctionType.NotAFunction:
@@ -135,18 +154,12 @@ private static bool IsInternalIp(string? ipAddress, IList<string> podIps)
     private static void BuildStatusResponse(IReplicasService replicasService,
         string functionName, HttpResponse contextResponse)
     {
-        DeploymentInformation? function = SearchFunction(replicasService, functionName);
-        if (function != null)
+        DeploymentInformation? functionDeploymentInformation = SearchFunction(replicasService, functionName);
+        if (functionDeploymentInformation != null)
         {
-            DeploymentInformation? functionDeploymentInformation =
-                replicasService.Deployments.Functions.FirstOrDefault(f => f.Deployment == functionName);
-            int numberReady = functionDeploymentInformation == null
-                ? 0
-                : functionDeploymentInformation.Pods.Count(p => p.Ready.HasValue && p.Ready.Value);
-            int numberRequested =
-                functionDeploymentInformation?.Replicas ?? 0;
+            FunctionStatus functionStatus = MapToFunctionStatus(functionDeploymentInformation);
             contextResponse.StatusCode = 200;
-            contextResponse.WriteAsJsonAsync(new FunctionStatus(numberReady, numberRequested),
+            contextResponse.WriteAsJsonAsync(functionStatus,
                 FunctionStatusSerializerContext.Default.FunctionStatus);
         }
         else
@@ -155,6 +168,17 @@ private static void BuildStatusResponse(IReplicasService replicasService,
         }
     }
 
+    private static FunctionStatus MapToFunctionStatus(DeploymentInformation functionDeploymentInformation)
+    {
+        int numberReady = functionDeploymentInformation.Pods.Count(p => p.Ready.HasValue && p.Ready.Value);
+        int numberRequested =
+            functionDeploymentInformation.Replicas;
+        var functionStatus = new FunctionStatus(numberReady, numberRequested,
+            functionDeploymentInformation.PodType,
+            functionDeploymentInformation.Visibility);
+        return functionStatus;
+    }
+
     private static void BuildWakeResponse(IReplicasService replicasService, IWakeUpFunction wakeUpFunction,
         string functionName, HttpResponse contextResponse)
     {