Remove expiry from SyncFileInfo

2 files changed, 8 insertions, 16 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 b30b8e22fc5..8449f4e902f 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
@@ -108,7 +108,7 @@ public class VespaServiceDumperImpl implements VespaServiceDumper {
                 context.log(log, "Producing artifact of type '" + producer.artifactName() + "'");
                 producedArtifacts.addAll(producer.produceArtifacts(producerCtx));
             }
-            uploadArtifacts(context, destination, producedArtifacts, expiry);
+            uploadArtifacts(context, destination, producedArtifacts);
             storeReport(context, ServiceDumpReport.createSuccessReport(request, startedAt, clock.instant(), destination));
         } catch (Exception e) {
             handleFailure(context, request, startedAt, e);
@@ -121,17 +121,17 @@ public class VespaServiceDumperImpl implements VespaServiceDumper {
     }
 
     private void uploadArtifacts(NodeAgentContext ctx, URI destination,
-                                 List<Artifact> producedArtifacts, Instant expiry) {
+                                 List<Artifact> producedArtifacts) {
         ApplicationId owner = ctx.node().owner().orElseThrow();
         List<SyncFileInfo> filesToUpload = producedArtifacts.stream()
                 .map(a -> {
                     Compression compression = a.compressOnUpload() ? Compression.ZSTD : Compression.NONE;
                     String classification = a.classification().map(Artifact.Classification::value).orElse(null);
-                    return SyncFileInfo.forServiceDump(destination, a.file(), expiry, compression, owner, classification);
+                    return SyncFileInfo.forServiceDump(destination, a.file(), compression, owner, classification);
                 })
                 .collect(Collectors.toList());
         ctx.log(log, Level.INFO,
-                "Uploading " + filesToUpload.size() + " file(s) with destination " + destination + " and expiry " + expiry);
+                "Uploading " + filesToUpload.size() + " file(s) with destination " + destination);
         if (!syncClient.sync(ctx, filesToUpload, Integer.MAX_VALUE)) {
             throw new RuntimeException("Unable to upload all files");
         }
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 6d87a8cfc4a..1854ed67389 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
@@ -5,8 +5,6 @@ import com.yahoo.config.provision.ApplicationId;
 
 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;
@@ -19,15 +17,13 @@ public class SyncFileInfo {
     private final Path source;
     private final URI destination;
     private final Compression uploadCompression;
-    private final Instant expiry;
     private final Map<String, String> tags;
 
-    private SyncFileInfo(Path source, URI destination, Compression uploadCompression, Instant expiry,
+    private SyncFileInfo(Path source, URI destination, Compression uploadCompression,
                          Map<String, String> tags) {
         this.source = source;
         this.destination = destination;
         this.uploadCompression = uploadCompression;
-        this.expiry = expiry;
         this.tags = Map.copyOf(tags);
     }
 
@@ -46,9 +42,6 @@ public class SyncFileInfo {
         return uploadCompression;
     }
 
-    /** File expiry */
-    public Optional<Instant> expiry() { return Optional.ofNullable(expiry); }
-
     public Map<String, String> tags() { return tags; }
 
     public static Optional<SyncFileInfo> forLogFile(URI uri, Path logFile, boolean rotatedOnly, ApplicationId owner) {
@@ -70,12 +63,11 @@ public class SyncFileInfo {
         }
 
         if (dir == null) return Optional.empty();
-        Instant expiry = Instant.now().plus(30, ChronoUnit.DAYS);
         return Optional.of(new SyncFileInfo(
-                logFile, uri.resolve(dir + logFile.getFileName() + compression.extension), compression, expiry, defaultTags(owner)));
+                logFile, uri.resolve(dir + logFile.getFileName() + compression.extension), compression, defaultTags(owner)));
     }
 
-    public static SyncFileInfo forServiceDump(URI destinationDir, Path file, Instant expiry, Compression compression,
+    public static SyncFileInfo forServiceDump(URI destinationDir, Path file, Compression compression,
                                               ApplicationId owner, String assetClassification) {
         String filename = file.getFileName().toString();
         URI location = destinationDir.resolve(filename + compression.extension);
@@ -83,7 +75,7 @@ public class SyncFileInfo {
         if (assetClassification != null) {
             tags.put("vespa:AssetClassification", assetClassification);
         }
-        return new SyncFileInfo(file, location, compression, expiry, tags);
+        return new SyncFileInfo(file, location, compression, tags);
     }
 
     private static Map<String, String> defaultTags(ApplicationId owner) {