Merge branch 'master' into bjormel/aws-main-controller

1 files changed, 17 insertions, 0 deletions

diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/archive/ArchiveService.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/archive/ArchiveService.java
index ed965f4331e..66cf3eef954 100644
--- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/archive/ArchiveService.java
+++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/archive/ArchiveService.java
@@ -1,6 +1,7 @@
 // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.vespa.hosted.controller.api.integration.archive;
 
+import com.yahoo.component.Version;
 import com.yahoo.config.provision.CloudAccount;
 import com.yahoo.config.provision.TenantName;
 import com.yahoo.config.provision.zone.ZoneId;
@@ -10,6 +11,7 @@ import java.net.URI;
 import java.util.Map;
 import java.util.Optional;
 import java.util.Set;
+import java.util.stream.Stream;
 
 /**
  * Service that manages archive storage URIs for tenant nodes.
@@ -28,4 +30,19 @@ public interface ArchiveService {
     Optional<String> findEnclaveArchiveBucket(ZoneId zoneId, CloudAccount cloudAccount);
 
     URI bucketURI(ZoneId zoneId, String bucketName);
+
+    /**
+     * @return the version of the template that was used during the last apply for the given cloud account,
+     *         or {@link Version#emptyVersion} if the version tag was not present or invalid,
+     *         or {@link Optional#empty()} if the we have no access to the cloud account (template probably not applied yet)
+     */
+    Optional<Version> getEnclaveTemplateVersion(CloudAccount cloudAccount);
+
+    static Stream<Version> parseVersion(String versionString) {
+        try {
+            return Stream.of(Version.fromString(versionString));
+        } catch (IllegalArgumentException e) {
+            return Stream.empty();
+        }
+    }
 }