Fix/resolved paths in config view

CHANGELOG.md

@@ -32,6 +32,8 @@ The default `multiple_sep` has been changed from `:` to `;` to avoid conflicts w
 
 * `schema`: Don't require undocumented fields to set default values and add the `links` and `reference` fields to functionality as they were not meant only to be in the project config (PR #636).
 
+* `resource path`: Don't finalize the `path` field of a resource until it's written as part of building a component (PR #668).
+
 * `export json_schema`: Fix minor inconsistencies and make the strict schema stricter by adapting to what Viash will effectively return (PR #666).
 
 # Viash 0.9.0-RC1 (2024-01-26): Restructure platforms into runners and engines

src/main/scala/io/viash/config/ConfigMeta.scala

@@ -78,18 +78,23 @@ object ConfigMeta {
 
     // change the config object before writing to yaml:
     // * substitute 'text' fields in resources with placeholders
+    // * set 'path' fields to the resourcePath
     // * add more info variables
     val toWriteConfig = config.copy(
       resources = config.resources.map{ res =>
         if (res.text.isDefined) {
           val textVal = Some(placeholderMap(res))
           res.copyResource(text = textVal, parent = None)
         } else {
-          res.copyResource(parent = None)
+          res.copyResource(parent = None, path = Some(res.resourcePath))
         }
       },
       test_resources = config.test_resources.map { res =>
-        res.copyResource(parent = None)
+        if (res.text.isDefined) {
+          res.copyResource(parent = None)
+        } else {
+          res.copyResource(parent = None, path = Some(res.resourcePath))
+        }
       },
       build_info = config.build_info.map(_.copy(
         output = buildDir.map(_.toString),

src/main/scala/io/viash/config/resources/Resource.scala

@@ -83,7 +83,7 @@
 
   // val uri: Option[URI] = path.map(IO.uri)
   def uri: Option[URI] = {
-    path match {
+    resolvedPath match {
       case Some(pat) => {
         val patEsc = pat.replaceAll(" ", "%20")
         val newPath = parent match {
@@ -96,6 +96,25 @@
     }
   }
 
+  def resolvedPath: Option[String] = {
+    if (this.isInstanceOf[Executable]) {
+      return path
+    }
+    if (path.isEmpty || path.get.contains(":")) {
+      return path
+    }
+
+    val pathStr = path.get
+    if (pathStr.startsWith("/")) {
+      if (parent.isEmpty) {
+        throw new RuntimeException(s"One of the resources is relative to the package root ($path), but no package config file (_viash.yaml) could be found.")
+      }
+      Some(IO.resolvePathWrtURI(pathStr, parent.get))
+    } else {
+      path
+    }
+  }
+
   private val basenameRegex = ".*/".r
   private val getFolderNameRegex = ".*?([^/]+|/)/*$".r
 
@@ -109,7 +128,7 @@
     if (dest.isDefined) {
       dest.get
     } else {
-      getFolderNameRegex.replaceFirstIn(Paths.get(path.get).normalize.toString, "$1")
+      getFolderNameRegex.replaceFirstIn(Paths.get(resolvedPath.get).normalize.toString, "$1")
     }
   }
   /**
@@ -160,22 +179,20 @@
       if (packageDir.isEmpty) {
         throw new RuntimeException(s"One of the resources is relative to the package root ($path), but no package config file (_viash.yaml) could be found.")
       }
-      val pathStr1 = IO.resolvePathWrtURI(pathStr, packageDir.get)
-      return this.copyResource(
-        path = Some(pathStr1),
+      return copyResource(
         parent = packageDir
       )
     }
 
     // if the path is relative (which it probably should be),
     // set the directory of the config as the parent of this file.
     if (!Paths.get(pathStr).isAbsolute) {
-      return this.copyResource(
+      return copyResource(
         parent = Some(parent)
       )
     }
 
-    return this
+    this
   }
 
   // TODO: This can probably be solved much nicer.

src/main/scala/io/viash/helpers/NsExecData.scala

@@ -66,7 +66,7 @@ object NsExecData {
   def apply(configPath: String, config: Config, runner: Option[Runner], engine: Option[Engine]): NsExecData = {
     val configPath_ = Paths.get(configPath)
     val dirPath = configPath_.getParent()
-    val mainScript = config.mainScript.flatMap(s => s.path).map(dirPath.resolve(_))
+    val mainScript = config.mainScript.flatMap(s => s.resolvedPath).map(dirPath.resolve(_))
     apply(
       configFullPath = configPath,
       absoluteConfigFullPath = configPath_.toAbsolutePath.toString,

src/test/scala/io/viash/e2e/build/DockerMeta.scala

@@ -16,11 +16,12 @@ import io.viash.config.resources.PlainFile
 class DockerMeta extends AnyFunSuite with BeforeAndAfterAll {
   Logger.UseColorOverride.value = Some(false)
   // which config to test
-  private val configFile = getClass.getResource(s"/testbash/config.vsh.yaml").getPath
+  private val configFile = getClass.getResource("/testbash/config.vsh.yaml").getPath
+  private val parent = getClass.getResource("/").toURI()
 
   // parse config from file
   private val config = Config.read(configFile)
-  private def configAndResources = PlainFile(path = Some(configFile.toString)) :: config.resources
+  private def configAndResources = PlainFile(path = Some("testbash/config.vsh.yaml"), parent = Some(parent)) :: config.resources
 
   test("Get meta data of a docker", DockerTest) {
     // Create temporary folder to copy the files to so we can do a git init in that folder

src/test/scala/io/viash/e2e/config_inject/MainConfigInjectSuite.scala

@@ -42,7 +42,7 @@ class MainConfigInjectSuite extends AnyFunSuite with BeforeAndAfterAll {
 
       val config = Config.read(configFile.toString())
 
-      val scriptFile = destPath.resolve(s"$name/" + config.mainScript.get.path.get) // assume all of these things exist
+      val scriptFile = destPath.resolve(s"$name/" + config.mainScript.get.resolvedPath.get) // assume all of these things exist
       assert(scriptFile.toFile().exists, "Check dest script exists")
 
       // inject script