summaryrefslogtreecommitdiffstats
path: root/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application
diff options
context:
space:
mode:
authorjonmv <venstad@gmail.com>2022-04-27 14:00:01 +0200
committerjonmv <venstad@gmail.com>2022-04-27 14:00:01 +0200
commitf2d37944ef2e24fb727140915767f6eec699fa1d (patch)
tree715f4e4a366de2d6be47e90c3cad8cc52fd2b156 /controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application
parentb0fbdb9759b687c8b7928da922a1e78cbbd579cd (diff)
Warn when application is built with a parent on lower major than the system
Diffstat (limited to 'controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application')
-rw-r--r--controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/pkg/ApplicationPackage.java5
1 files changed, 5 insertions, 0 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;