Enable streaming of build logs

src/main/groovy/io/seqera/wave/service/builder/BuildStrategy.groovy

@@ -37,6 +37,8 @@ abstract class BuildStrategy {
 
     abstract BuildResult build(BuildRequest req)
 
+    abstract String getLogs(String buildId)
+
     void cleanup(BuildRequest req) {
         req.workDir?.deleteDir()
     }

src/main/groovy/io/seqera/wave/service/builder/DockerBuildStrategy.groovy

@@ -113,7 +113,7 @@ class DockerBuildStrategy extends BuildStrategy {
                 ? cmdForKaniko( req.workDir, credsFile, spack, req.platform)
                 : cmdForSingularity( req.workDir, credsFile, spack, req.platform)
 
-        return dockerCmd + launchCmd(req)
+        return dockerCmd + builderName(req.buildId) +launchCmd(req)
     }
 
     protected List<String> cmdForKaniko(Path workDir, Path credsFile, SpackConfig spackConfig, ContainerPlatform platform ) {
@@ -173,4 +173,19 @@ class DockerBuildStrategy extends BuildStrategy {
         wrapper.add(buildConfig.singularityImage(platform))
         return wrapper
     }
+
+    protected List<String> builderName(String buildId) {
+        def name = "build-${buildId}".toString().replace('_', '-')
+        return List.of('--name', name)
+    }
+
+    @Override
+    String getLogs(String buildId) {
+        def logCmd = ['docker', 'logs'] + builderName(buildId)
+        final proc = new ProcessBuilder()
+                .command(logCmd)
+                .redirectErrorStream(true)
+                .start()
+        return proc.inputStream.text
+    }
 }

src/main/groovy/io/seqera/wave/service/builder/KubeBuildStrategy.groovy

@@ -71,8 +71,8 @@ class KubeBuildStrategy extends BuildStrategy {
     @Inject
     private RegistryProxyService proxyService
 
-    protected String podName(BuildRequest req) {
-        return "build-${req.buildId}".toString().replace('_', '-')
+    protected String podName(String buildId) {
+        return "build-${buildId}".toString().replace('_', '-')
     }
 
     @Override
@@ -96,7 +96,7 @@ class KubeBuildStrategy extends BuildStrategy {
         try {
             final buildImage = getBuildImage(req)
             final buildCmd = launchCmd(req)
-            final name = podName(req)
+            final name = podName(req.buildId)
             final selector= getSelectorLabel(req.platform, nodeSelectorMap)
             final spackCfg0 = req.isSpackBuild ? spackConfig : null
             final pod = k8sService.buildContainer(name, buildImage, buildCmd, req.workDir, configFile, spackCfg0, selector)
@@ -130,7 +130,7 @@ class KubeBuildStrategy extends BuildStrategy {
     @Override
     void cleanup(BuildRequest req) {
         super.cleanup(req)
-        final name = podName(req)
+        final name = podName(req.buildId)
         try {
             k8sService.deletePod(name)
         }
@@ -139,4 +139,9 @@ class KubeBuildStrategy extends BuildStrategy {
         }
     }
 
+    @Override
+    String getLogs(String buildId) {
+        return k8sService.logsPod(podName(buildId))
+    }
+
 }

src/main/groovy/io/seqera/wave/service/k8s/K8sServiceImpl.groovy

@@ -442,7 +442,7 @@ class K8sServiceImpl implements K8sService {
         }
     }
 
-    /**
+/**
      * Fetch the logs of a pod
      *
      * @param name The pod name

src/main/groovy/io/seqera/wave/service/logs/BuildLogServiceImpl.groovy

@@ -32,6 +32,9 @@ import io.micronaut.objectstorage.request.UploadRequest
 import io.micronaut.runtime.event.annotation.EventListener
 import io.seqera.wave.service.builder.BuildEvent
 import io.seqera.wave.service.builder.BuildRequest
+import io.seqera.wave.service.builder.BuildStrategy
+import io.seqera.wave.service.builder.KubeBuildStrategy
+import io.seqera.wave.service.k8s.K8sService
 import io.seqera.wave.service.persistence.PersistenceService
 import jakarta.annotation.PostConstruct
 import jakarta.inject.Inject
@@ -56,6 +59,9 @@ class BuildLogServiceImpl implements BuildLogService {
     @Inject
     private PersistenceService persistenceService
 
+    @Inject
+    private BuildStrategy buildStrategy
+
     @Nullable
     @Value('${wave.build.logs.prefix}')
     private String prefix
@@ -107,7 +113,13 @@ class BuildLogServiceImpl implements BuildLogService {
     private StreamedFile fetchLogStream0(String buildId) {
         if( !buildId ) return null
         final Optional<ObjectStorageEntry<?>> result = objectStorageOperations.retrieve(logKey(buildId))
-        return result.isPresent() ? result.get().toStreamedFile() : null
+        return result.isPresent() ? result.get().toStreamedFile() : fetchLogStream1(buildId)
+    }
+
+    private StreamedFile fetchLogStream1(String buildId) {
+        StreamedFile result = null
+        buildStrategy.getLogs(buildId)
+        return result
     }
 
     @Override

src/test/groovy/io/seqera/wave/service/builder/FutureContainerBuildServiceTest.groovy

@@ -53,6 +53,11 @@ class FutureContainerBuildServiceTest extends Specification {
             BuildResult build(BuildRequest req) {
                 new BuildResult("", exitCode, "a fake build result in a test", Instant.now(), Duration.ofSeconds(3), 'abc')
             }
+
+            @Override
+            String getLogs(String buildId) {
+                return "fake build logs"
+            }
         }
     }
 

src/test/groovy/io/seqera/wave/service/builder/KubeBuildStrategyTest.groovy

@@ -122,7 +122,7 @@ class KubeBuildStrategyTest extends Specification {
         req = req.withBuildId('1')
 
         when:
-        def podName = strategy.podName(req)
+        def podName = strategy.podName(req.buildId)
 
         then:
         req.buildId == '143ee73bcdac45b1_1'