From 3f8699a59bb4d10b592bc6f35567685ed95e6c41 Mon Sep 17 00:00:00 2001
From: benbierens <thatbenbierens@gmail.com>
Date: Tue, 7 Nov 2023 14:33:45 +0100
Subject: [PATCH] Removes dependency on pod information for elastic search
 download

---
 .../ElasticSearchLogDownloader.cs                 | 15 ++++++++++-----
 Tests/CodexContinuousTests/SingleTestRun.cs       |  7 ++++---
 Tests/CodexContinuousTests/StartupChecker.cs      |  3 ++-
 3 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/Tests/CodexContinuousTests/ElasticSearchLogDownloader.cs b/Tests/CodexContinuousTests/ElasticSearchLogDownloader.cs
index 7d6a19e..3311efb 100644
--- a/Tests/CodexContinuousTests/ElasticSearchLogDownloader.cs
+++ b/Tests/CodexContinuousTests/ElasticSearchLogDownloader.cs
@@ -46,17 +46,22 @@ namespace ContinuousTests
 
         private string CreateQueryTemplate(RunningContainer container, DateTime startUtc, DateTime endUtc)
         {
-            var workflow = tools.CreateWorkflow();
-            var podInfo = workflow.GetPodInfo(container);
-            var podName = podInfo.Name;
             var start = startUtc.ToString("o");
             var end = endUtc.ToString("o");
 
-            var source = "{ \"sort\": [ { \"@timestamp\": { \"order\": \"asc\" } } ], \"fields\": [ { \"field\": \"@timestamp\", \"format\": \"strict_date_optional_time\" }, { \"field\": \"pod_name\" }, { \"field\": \"message\" } ], \"size\": <SIZE>, <SEARCHAFTER> \"_source\": false, \"query\": { \"bool\": { \"must\": [], \"filter\": [ { \"range\": { \"@timestamp\": { \"format\": \"strict_date_optional_time\", \"gte\": \"<STARTTIME>\", \"lte\": \"<ENDTIME>\" } } }, { \"match_phrase\": { \"pod_name\": \"<PODNAME>\" } } ] } } }";
+            var containerName = container.RunningContainers.StartResult.Deployment.Name;
+            var namespaceName = container.RunningContainers.StartResult.Cluster.Configuration.KubernetesNamespace;
+
+            //container_name : codex3-5 - deploymentName as stored in pod
+            // pod_namespace : codex - continuous - nolimits - tests - 1
+
+            //var source = "{ \"sort\": [ { \"@timestamp\": { \"order\": \"asc\" } } ], \"fields\": [ { \"field\": \"@timestamp\", \"format\": \"strict_date_optional_time\" }, { \"field\": \"pod_name\" }, { \"field\": \"message\" } ], \"size\": <SIZE>, <SEARCHAFTER> \"_source\": false, \"query\": { \"bool\": { \"must\": [], \"filter\": [ { \"range\": { \"@timestamp\": { \"format\": \"strict_date_optional_time\", \"gte\": \"<STARTTIME>\", \"lte\": \"<ENDTIME>\" } } }, { \"match_phrase\": { \"pod_name\": \"<PODNAME>\" } } ] } } }";
+            var source = "{ \"sort\": [ { \"@timestamp\": { \"order\": \"asc\" } } ], \"fields\": [ { \"field\": \"@timestamp\", \"format\": \"strict_date_optional_time\" }, { \"field\": \"message\" } ], \"size\": <SIZE>, <SEARCHAFTER> \"_source\": false, \"query\": { \"bool\": { \"must\": [], \"filter\": [ { \"range\": { \"@timestamp\": { \"format\": \"strict_date_optional_time\", \"gte\": \"<STARTTIME>\", \"lte\": \"<ENDTIME>\" } } }, { \"match_phrase\": { \"container_name\": \"<CONTAINERNAME>\" } }, { \"match_phrase\": { \"pod_namespace\": \"<NAMESPACENAME>\" } } ] } } }";
             return source
                 .Replace("<STARTTIME>", start)
                 .Replace("<ENDTIME>", end)
-                .Replace("<PODNAME>", podName);
+                .Replace("<CONTAINERNAME>", containerName)
+                .Replace("<NAMESPACENAME>", namespaceName);
         }
 
         private IHttp CreateElasticSearchHttp()
diff --git a/Tests/CodexContinuousTests/SingleTestRun.cs b/Tests/CodexContinuousTests/SingleTestRun.cs
index de88522..156cbb9 100644
--- a/Tests/CodexContinuousTests/SingleTestRun.cs
+++ b/Tests/CodexContinuousTests/SingleTestRun.cs
@@ -111,11 +111,12 @@ namespace ContinuousTests
             var effectiveEnd = DateTime.UtcNow;
             var elasticSearchLogDownloader = new ElasticSearchLogDownloader(entryPoint.Tools, fixtureLog);
 
-            var workflow = entryPoint.Tools.CreateWorkflow();
             foreach (var node in nodes)
             {
-                var podInfo = workflow.GetPodInfo(node.Container);
-                var openingLine = $"{podInfo.Name} = {node.Container.Name} = {node.GetDebugInfo().id}";
+                var container = node.Container;
+                var deploymentName = container.RunningContainers.StartResult.Deployment.Name;
+                var namespaceName = container.RunningContainers.StartResult.Cluster.Configuration.KubernetesNamespace;
+                var openingLine = $"{namespaceName} - {deploymentName} = {node.Container.Name} = {node.GetDebugInfo().id}";
                 elasticSearchLogDownloader.Download(fixtureLog.CreateSubfile(), node.Container, effectiveStart, effectiveEnd, openingLine);
             }
         }
diff --git a/Tests/CodexContinuousTests/StartupChecker.cs b/Tests/CodexContinuousTests/StartupChecker.cs
index cb7c6ce..94e318c 100644
--- a/Tests/CodexContinuousTests/StartupChecker.cs
+++ b/Tests/CodexContinuousTests/StartupChecker.cs
@@ -46,7 +46,8 @@ namespace ContinuousTests
                 {
                     var podInfo = workflow.GetPodInfo(container);
                     log.Log($"Codex environment variables for '{container.Name}':");
-                    log.Log($"Pod name: {podInfo.Name} - Deployment name: {instance.Containers.StartResult.Deployment.Name}");
+                    log.Log($"Namespace: {container.RunningContainers.StartResult.Cluster.Configuration.KubernetesNamespace} - " +
+                        $"Pod name: {podInfo.Name} - Deployment name: {instance.Containers.StartResult.Deployment.Name}");
                     var codexVars = container.Recipe.EnvVars;
                     foreach (var vars in codexVars) log.Log(vars.ToString());
                     log.Log("");