Warn when application is built with a parent on lower major than the system

6 files changed, 23 insertions, 4 deletions

diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/pkg/ApplicationPackage.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/pkg/ApplicationPackage.java
index 0d39703b70d..cabfa44e00d 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/pkg/ApplicationPackage.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/pkg/ApplicationPackage.java
@@ -78,6 +78,7 @@ public class ApplicationPackage {
     private final ZipArchiveCache files;
     private final Optional<Version> compileVersion;
     private final Optional<Instant> buildTime;
+    private final Optional<Version> parentVersion;
     private final List<X509Certificate> trustedCertificates;
 
     /**
@@ -110,6 +111,7 @@ public class ApplicationPackage {
         Optional<Inspector> buildMetaObject = files.get(buildMetaFile).map(SlimeUtils::jsonToSlime).map(Slime::get);
         this.compileVersion = buildMetaObject.flatMap(object -> parse(object, "compileVersion", field -> Version.fromString(field.asString())));
         this.buildTime = buildMetaObject.flatMap(object -> parse(object, "buildTime", field -> Instant.ofEpochMilli(field.asLong())));
+        this.parentVersion = buildMetaObject.flatMap(object -> parse(object, "parentVersion", field -> Version.fromString(field.asString())));
 
         this.trustedCertificates = files.get(trustedCertificatesFile).map(bytes -> X509CertificateUtils.certificateListFromPem(new String(bytes, UTF_8))).orElse(List.of());
 
@@ -159,6 +161,9 @@ public class ApplicationPackage {
     /** Returns the time this package was built, if known. */
     public Optional<Instant> buildTime() { return buildTime; }
 
+    /** Returns the parent version used to compile the package, if known. */
+    public Optional<Version> parentVersion() { return parentVersion; }
+
     /** Returns the list of certificates trusted by this application, or an empty list if no trust configured. */
     public List<X509Certificate> trustedCertificates() {
         return trustedCertificates;
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/JobController.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/JobController.java
index 7ba8191d1fc..1d56e2db08b 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/JobController.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/JobController.java
@@ -490,14 +490,24 @@ public class JobController {
 
             TestSummary testSummary = TestPackage.validateTests(submission.applicationPackage().deploymentSpec(), submission.testPackage());
             if (testSummary.problems().isEmpty())
-                controller.notificationsDb().removeNotification(NotificationSource.from(id),
-                                                                Type.testPackage);
+                controller.notificationsDb().removeNotification(NotificationSource.from(id), Type.testPackage);
             else
                 controller.notificationsDb().setNotification(NotificationSource.from(id),
                                                              Type.testPackage,
                                                              Notification.Level.warning,
                                                              testSummary.problems());
 
+            submission.applicationPackage().parentVersion().ifPresent(parent -> {
+                if (parent.getMajor() < controller.readSystemVersion().getMajor())
+                    controller.notificationsDb().setNotification(NotificationSource.from(id),
+                                                                 Type.submission,
+                                                                 Notification.Level.warning,
+                                                                 "Parent version used to compile the application is on a " +
+                                                                 "lower major version than the current Vespa Cloud version");
+                else
+                    controller.notificationsDb().removeNotification(NotificationSource.from(id), Type.submission);
+            });
+
             applications.storeWithUpdatedConfig(application, submission.applicationPackage());
             applications.deploymentTrigger().triggerNewRevision(id);
         });
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/Submission.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/Submission.java
index feb15ce188b..e366920690b 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/Submission.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/Submission.java
@@ -1,12 +1,10 @@
 package com.yahoo.vespa.hosted.controller.deployment;
 
-import com.yahoo.component.Version;
 import com.yahoo.vespa.hosted.controller.api.integration.deployment.ApplicationVersion;
 import com.yahoo.vespa.hosted.controller.api.integration.deployment.RevisionId;
 import com.yahoo.vespa.hosted.controller.api.integration.deployment.SourceRevision;
 import com.yahoo.vespa.hosted.controller.application.pkg.ApplicationPackage;
 
-import java.time.Instant;
 import java.util.Optional;
 
 import static com.yahoo.vespa.hosted.controller.application.pkg.ApplicationPackage.calculateHash;
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/notification/Notification.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/notification/Notification.java
index 38cb09355ca..8a363405c41 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/notification/Notification.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/notification/Notification.java
@@ -69,6 +69,9 @@ public class Notification {
         /** Related to contents of application package, e.g., usage of deprecated features/syntax */
         applicationPackage,
 
+        /** Related to contents of application package, e.g., old parent or compile version, or errors detectable on submission */
+        submission,
+
         /** Related to contents of application test package, e.g., mismatch between deployment spec and provided tests */
         testPackage,
 
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/persistence/NotificationsSerializer.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/persistence/NotificationsSerializer.java
index 570dbdd870e..16ec240a116 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/persistence/NotificationsSerializer.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/persistence/NotificationsSerializer.java
@@ -92,6 +92,7 @@ public class NotificationsSerializer {
     private static String asString(Notification.Type type) {
         switch (type) {
             case applicationPackage: return "applicationPackage";
+            case submission: return "submission";
             case testPackage: return "testPackage";
             case deployment: return "deployment";
             case feedBlock: return "feedBlock";
@@ -103,6 +104,7 @@ public class NotificationsSerializer {
     private static Notification.Type typeFrom(Inspector field) {
         switch (field.asString()) {
             case "applicationPackage": return Notification.Type.applicationPackage;
+            case "submission": return Notification.Type.submission;
             case "testPackage": return Notification.Type.testPackage;
             case "deployment": return Notification.Type.deployment;
             case "feedBlock": return Notification.Type.feedBlock;
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java
index d163ba9d02c..88b319d0051 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java
@@ -745,6 +745,7 @@ public class ApplicationApiHandler extends AuditLoggingRequestHandler {
 
     private static String notificationTypeAsString(Notification.Type type) {
         switch (type) {
+            case submission:
             case applicationPackage: return "applicationPackage";
             case testPackage: return "testPackage";
             case deployment: return "deployment";