Tag files uploaded with asset classification

2 files changed, 12 insertions, 4 deletions

diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/servicedump/VespaServiceDumperImpl.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/servicedump/VespaServiceDumperImpl.java
index 058599a3a74..23a6ed2aa8c 100644
--- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/servicedump/VespaServiceDumperImpl.java
+++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/servicedump/VespaServiceDumperImpl.java
@@ -129,7 +129,8 @@ public class VespaServiceDumperImpl implements VespaServiceDumper {
                     Compression compression = a.compressOnUpload() ? Compression.ZSTD : Compression.NONE;
                     Path fileInNode = a.fileInNode().orElse(null);
                     Path fileOnHost = fileInNode != null ? ctx.pathOnHostFromPathInNode(fileInNode) : a.fileOnHost().orElseThrow();
-                    return SyncFileInfo.forServiceDump(destination, fileOnHost, expiry, compression, owner);
+                    String classification = a.classification().map(Artifact.Classification::value).orElse(null);
+                    return SyncFileInfo.forServiceDump(destination, fileOnHost, expiry, compression, owner, classification);
                 })
                 .collect(Collectors.toList());
         ctx.log(log, Level.INFO,
diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/sync/SyncFileInfo.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/sync/SyncFileInfo.java
index f220ec2b2fc..6d87a8cfc4a 100644
--- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/sync/SyncFileInfo.java
+++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/sync/SyncFileInfo.java
@@ -7,6 +7,7 @@ import java.net.URI;
 import java.nio.file.Path;
 import java.time.Instant;
 import java.time.temporal.ChronoUnit;
+import java.util.HashMap;
 import java.util.Map;
 import java.util.Optional;
 
@@ -75,14 +76,20 @@ public class SyncFileInfo {
     }
 
     public static SyncFileInfo forServiceDump(URI destinationDir, Path file, Instant expiry, Compression compression,
-                                              ApplicationId owner) {
+                                              ApplicationId owner, String assetClassification) {
         String filename = file.getFileName().toString();
         URI location = destinationDir.resolve(filename + compression.extension);
-        return new SyncFileInfo(file, location, compression, expiry, defaultTags(owner));
+        Map<String, String> tags = defaultTags(owner);
+        if (assetClassification != null) {
+            tags.put("vespa:AssetClassification", assetClassification);
+        }
+        return new SyncFileInfo(file, location, compression, expiry, tags);
     }
 
     private static Map<String, String> defaultTags(ApplicationId owner) {
-        return Map.of("corp:Application", owner.toFullString());
+        var tags = new HashMap<String, String>();
+        tags.put("corp:Application", owner.toFullString());
+        return tags;
     }
 
     public enum Compression {