Merge pull request #988 from KelvinTegelaar/dev

[pull] dev from KelvinTegelaar:dev

Author: pull[bot]

Modules/CIPPHTTP/Public/Entrypoints/HTTP Functions/Invoke-ExecTestRun.ps1

@@ -12,33 +12,68 @@ function Invoke-ExecTestRun {
 
     try {
         $TenantFilter = $Request.Query.tenantFilter ?? $Request.Body.tenantFilter
-        Write-LogMessage -API $APIName -tenant $TenantFilter -message "Starting data collection and test run for tenant: $TenantFilter" -sev Info
-        $Batch = @(
-            @{
-                FunctionName = 'CIPPDBCacheData'
-                TenantFilter = $TenantFilter
-                QueueName    = "Cache - $TenantFilter"
+        $Mode = ($Request.Query.mode ?? $Request.Body.mode ?? 'both').ToString().ToLower()
+        if ($Mode -notin @('both', 'cache', 'tests')) { $Mode = 'both' }
+
+        switch ($Mode) {
+            'tests' {
+                Write-LogMessage -API $APIName -tenant $TenantFilter -message "Starting tests-only run for tenant: $TenantFilter" -sev Info
+                $InstanceId = Start-CIPPDBTestsRun -TenantFilter $TenantFilter -Force
+                $ResultMessage = "Successfully started test run for $TenantFilter"
+            }
+            'cache' {
+                Write-LogMessage -API $APIName -tenant $TenantFilter -message "Starting cache-only collection for tenant: $TenantFilter" -sev Info
+                $Batch = @(
+                    @{
+                        FunctionName = 'CIPPDBCacheData'
+                        TenantFilter = $TenantFilter
+                        QueueName    = "Cache - $TenantFilter"
+                    }
+                )
+                $InputObject = [PSCustomObject]@{
+                    OrchestratorName = "TestDataCollection-$TenantFilter"
+                    Batch            = $Batch
+                    SkipLog          = $false
+                    PostExecution    = @{
+                        FunctionName = 'CIPPDBCacheApplyBatch'
+                        Parameters   = @{
+                            TenantFilter = $TenantFilter
+                        }
+                    }
+                }
+                $InstanceId = Start-CIPPOrchestrator -InputObject $InputObject
+                $ResultMessage = "Successfully started cache collection for $TenantFilter"
             }
-        )
-        $InputObject = [PSCustomObject]@{
-            OrchestratorName = "TestDataCollectionAndRun-$TenantFilter"
-            Batch            = $Batch
-            SkipLog          = $false
-            PostExecution    = @{
-                FunctionName = 'CIPPDBCacheApplyBatch'
-                Parameters   = @{
-                    TestRun      = $true
-                    TenantFilter = $TenantFilter
+            default {
+                Write-LogMessage -API $APIName -tenant $TenantFilter -message "Starting data collection and test run for tenant: $TenantFilter" -sev Info
+                $Batch = @(
+                    @{
+                        FunctionName = 'CIPPDBCacheData'
+                        TenantFilter = $TenantFilter
+                        QueueName    = "Cache - $TenantFilter"
+                    }
+                )
+                $InputObject = [PSCustomObject]@{
+                    OrchestratorName = "TestDataCollectionAndRun-$TenantFilter"
+                    Batch            = $Batch
+                    SkipLog          = $false
+                    PostExecution    = @{
+                        FunctionName = 'CIPPDBCacheApplyBatch'
+                        Parameters   = @{
+                            TestRun      = $true
+                            TenantFilter = $TenantFilter
+                        }
+                    }
                 }
+                $InstanceId = Start-CIPPOrchestrator -InputObject $InputObject
+                $ResultMessage = "Successfully started data collection and test run for $TenantFilter"
             }
         }
 
-        $InstanceId = Start-CIPPOrchestrator -InputObject $InputObject
-
         $StatusCode = [HttpStatusCode]::OK
-        $Body = [PSCustomObject]@{ Results = "Successfully started data collection and test run for $TenantFilter" }
+        $Body = [PSCustomObject]@{ Results = $ResultMessage }
 
-        Write-LogMessage -API $APIName -tenant $TenantFilter -message "Data collection and test run orchestration started. Instance ID: $InstanceId" -sev Info
+        Write-LogMessage -API $APIName -tenant $TenantFilter -message "Mode '$Mode' orchestration started. Instance ID: $InstanceId" -sev Info
 
     } catch {
         $ErrorMessage = Get-CippException -Exception $_

Shared/CIPPSharp/CIPPTestDataCache.cs

@@ -19,8 +19,8 @@ namespace CIPP
     public static class TestDataCache
     {
         // ── Configuration ──
-        private static long _maxBytes = 50L * 1024 * 1024;   // 50 MB default
-        private static TimeSpan _ttl = TimeSpan.FromMinutes(1);
+        private static long _maxBytes = 100L * 1024 * 1024;  // 100 MB default
+        private static TimeSpan _ttl = TimeSpan.FromMinutes(5);
 
         // ── State ──
         private static readonly ConcurrentDictionary<string, CacheEntry> _cache = new();
@@ -52,7 +52,7 @@ public CacheEntry(object? value, long sizeBytes, DateTime expiresUtc)
         }
 
         /// <summary>Configure the cache limits. Call before first use or between test runs.</summary>
-        public static void Configure(long maxBytes = 50 * 1024 * 1024, int ttlSeconds = 60)
+        public static void Configure(long maxBytes = 100L * 1024 * 1024, int ttlSeconds = 300)
         {
             _maxBytes = maxBytes;
             _ttl = TimeSpan.FromSeconds(ttlSeconds);
@@ -172,6 +172,25 @@ public static void Clear()
             Interlocked.Exchange(ref _evictions, 0);
         }
 
+        /// <summary>
+        /// Remove all entries belonging to a single tenant. Cache keys are formatted
+        /// as "tenantFilter|type", so we match by the "tenantFilter|" prefix.
+        /// </summary>
+        public static int ClearTenant(string tenantFilter)
+        {
+            if (string.IsNullOrWhiteSpace(tenantFilter)) return 0;
+            var prefix = tenantFilter + "|";
+            int removed = 0;
+            // Snapshot keys to avoid mutating while iterating the concurrent dictionary
+            var matchingKeys = _cache.Keys.Where(k => k.StartsWith(prefix, StringComparison.OrdinalIgnoreCase)).ToList();
+            foreach (var key in matchingKeys)
+            {
+                RemoveEntry(key);
+                removed++;
+            }
+            return removed;
+        }
+
         public static int Count => _cache.Count;
         public static long CurrentBytes => Interlocked.Read(ref _currentBytes);
         public static double CurrentMB => Math.Round(Interlocked.Read(ref _currentBytes) / (1024.0 * 1024.0), 2);