14723: Fixes literal mapping and name conflict resolution

Arvados-DCO-1.1-Signed-off-by: Eric Biagiotti <ebiagiotti@veritasgenetics.com>

diff --git a/sdk/cwl/arvados_cwl/executor.py b/sdk/cwl/arvados_cwl/executor.py
index d185d70fe1d2afcd699f298085d7c5202639776d..0e46c53606f4b79694d8bd2acfe240b1195409f8 100644 (file)
--- a/sdk/cwl/arvados_cwl/executor.py
+++ b/sdk/cwl/arvados_cwl/executor.py
@@ -436,17 +436,17 @@ http://doc.arvados.org/install/install-api-server.html#disable_api_methods
         adjustFileObjs(outputObj, capture)
 
         generatemapper = NoFollowPathMapper(files, "", "", separateDirs=False)
+
         final = arvados.collection.Collection(api_client=self.api,
                                               keep_client=self.keep_client,
                                               num_retries=self.num_retries)
 
         for k,v in generatemapper.items():
-            if v.resolved.startswith("_:"):
-                if v.type == "Directory":
+            if v.type == "Directory" and v.resolved.startswith("_:"):
                     continue
-                if v.type == "CreateFile":
-                    with final.open(v.target, "wb") as f:
-                        f.write(v.resolved.encode("utf-8"))
+            if v.type == "CreateFile" and (k.startswith("_:") or v.resolved.startswith("_:")):
+                with final.open(v.target, "wb") as f:
+                    f.write(v.resolved.encode("utf-8"))
                     continue
 
             if not v.resolved.startswith("keep:"):

diff --git a/sdk/cwl/arvados_cwl/pathmapper.py b/sdk/cwl/arvados_cwl/pathmapper.py
index 37ca2515e4e141ad090fddff2a27c8c180708cca..f08d7d7b2a67a516118a087ca37f01ea9650c869 100644 (file)
--- a/sdk/cwl/arvados_cwl/pathmapper.py
+++ b/sdk/cwl/arvados_cwl/pathmapper.py
@@ -276,8 +276,14 @@ class StagingPathMapper(PathMapper):
         loc = obj["location"]
         tgt = os.path.join(stagedir, obj["basename"])
         basetgt, baseext = os.path.splitext(tgt)
+
+        def targetExists():
+            return tgt in self.targets and ("contents" not in obj) and (self._pathmap[tgt].resolved != loc)
+        def literalTargetExists():
+            return tgt in self.targets and "contents" in obj
+
         n = 1
-        if tgt in self.targets and (self.reversemap(tgt)[0] != loc):
+        if targetExists() or literalTargetExists():
             while tgt in self.targets:
                 n += 1
                 tgt = "%s_%i%s" % (basetgt, n, baseext)
@@ -293,7 +299,7 @@ class StagingPathMapper(PathMapper):
             if tgt in self._pathmap:
                 return
             if "contents" in obj and loc.startswith("_:"):
-                self._pathmap[tgt] = MapperEnt(obj["contents"], tgt, "CreateFile", staged)
+                self._pathmap[loc] = MapperEnt(obj["contents"], tgt, "CreateFile", staged)
             else:
                 if copy or obj.get("writable"):
                     self._pathmap[tgt] = MapperEnt(loc, tgt, "WritableFile", staged)
@@ -302,15 +308,16 @@ class StagingPathMapper(PathMapper):
                 self.visitlisting(obj.get("secondaryFiles", []), stagedir, basedir)
 
     def mapper(self, src):  # type: (Text) -> MapperEnt
+        def getMapperEnt(src):
+            for k,v in viewitems(self._pathmap):
+                if v.resolved == src or (v.type == "CreateFile" and k == src):
+                    return v
+
         if u"#" in src:
-            i = src.index(u"#")         
-            for k,v in self._pathmap.items():
-                if v.resolved == src[:i]:
-                    return MapperEnt(v.resolved, v.target + src[i:], v.type, v.staged)
-    
-        for k,v in self._pathmap.items():
-            if v.resolved == src:
-                return self._pathmap[k]
+            i = src.index(u"#")
+            v = getMapperEnt(src[i:])
+            return MapperEnt(v.resolved, v.target + src[i:], v.type, v.staged)
+        return getMapperEnt(src)
 
 
 class VwdPathMapper(StagingPathMapper):