Scan v2

build.gradle

@@ -35,7 +35,7 @@ dependencies {
     compileOnly("io.micronaut:micronaut-http-validation")
     implementation("jakarta.persistence:jakarta.persistence-api:3.0.0")
     api 'io.seqera:lib-mail:1.0.0'
-    api 'io.seqera:wave-api:0.12.0'
+    api 'io.seqera:wave-api:0.13.0'
     api 'io.seqera:wave-utils:0.13.1'
 
     implementation("io.micronaut:micronaut-http-client")
@@ -72,6 +72,7 @@ dependencies {
     implementation 'software.amazon.awssdk:ses'
     implementation 'org.yaml:snakeyaml:2.0'
     implementation 'com.github.ben-manes.caffeine:caffeine:3.1.8'
+    implementation 'org.luaj:luaj-jse:3.0.1'
     //object storage dependency
     implementation("io.micronaut.objectstorage:micronaut-object-storage-aws")
     // include sts to allow the use of service account role - https://stackoverflow.com/a/73306570

gradle.properties

@@ -17,4 +17,4 @@
 #
 
 micronautVersion=3.10.3
-micronautEnvs=dev,h2,mail,aws-ses
+micronautEnvs=dev,h2,mail,aws-ses,redis

src/main/groovy/io/seqera/wave/configuration/ScanConfig.groovy

@@ -75,6 +75,9 @@ class ScanConfig {
     @Value('${wave.scan.status.duration:1h}')
     Duration statusDuration
 
+    @Value('${wave.scan.id.duration:7d}')
+    Duration scanIdDuration
+
     String getScanImage() {
         return scanImage
     }
@@ -86,6 +89,11 @@ class ScanConfig {
         return result
     }
 
+    @Memoized
+    Path getWorkspace() {
+        Path.of(buildDirectory).toAbsolutePath()
+    }
+
     String getRequestsCpu() {
         return requestsCpu
     }

src/main/groovy/io/seqera/wave/controller/BuildController.groovy

@@ -30,11 +30,8 @@ import io.micronaut.http.server.types.files.StreamedFile
 import io.micronaut.scheduling.TaskExecutors
 import io.micronaut.scheduling.annotation.ExecuteOn
 import io.seqera.wave.api.BuildStatusResponse
-import io.seqera.wave.exception.BadRequestException
 import io.seqera.wave.service.builder.ContainerBuildService
 import io.seqera.wave.service.logs.BuildLogService
-import io.seqera.wave.service.mirror.ContainerMirrorService
-import io.seqera.wave.service.mirror.MirrorRequest
 import io.seqera.wave.service.persistence.WaveBuildRecord
 import jakarta.inject.Inject
 /**
@@ -51,12 +48,9 @@ class BuildController {
     @Inject
     private ContainerBuildService buildService
 
-    @Inject
-    private ContainerMirrorService mirrorService
-
     @Inject
     @Nullable
-    BuildLogService logService
+    private BuildLogService logService
 
     @Get("/v1alpha1/builds/{buildId}")
     HttpResponse<WaveBuildRecord> getBuildRecord(String buildId) {
@@ -79,25 +73,10 @@ class BuildController {
 
     @Get("/v1alpha1/builds/{buildId}/status")
     HttpResponse<BuildStatusResponse> getBuildStatus(String buildId) {
-        final resp = buildResponse0(buildId)
-        resp != null
-            ? HttpResponse.ok(resp)
+        final build = buildService.getBuildRecord(buildId)
+        build != null
+            ? HttpResponse.ok(build.toStatusResponse())
             : HttpResponse.<BuildStatusResponse>notFound()
     }
 
-    protected BuildStatusResponse buildResponse0(String buildId) {
-        if( !buildId )
-            throw new BadRequestException("Missing 'buildId' parameter")
-        // build IDs starting with the `mr-` prefix are interpreted as mirror requests
-        if( buildId.startsWith(MirrorRequest.ID_PREFIX) ) {
-            return mirrorService
-                    .getMirrorEntry(buildId)
-                    ?.toStatusResponse()
-        }
-        else {
-            return buildService
-                    .getBuildRecord(buildId)
-                    ?.toStatusResponse()
-        }
-    }
 }