diff options
author | Jon Marius Venstad <venstad@gmail.com> | 2021-11-24 10:02:54 +0100 |
---|---|---|
committer | Jon Marius Venstad <venstad@gmail.com> | 2021-11-24 10:10:25 +0100 |
commit | 19235461c9ef34ac31e71b18ad2c48f11e27c47f (patch) | |
tree | 03a23f1423d34bb5c674b6094ebf7d7e400a59bd /controller-server | |
parent | a54cac076db07148dd461aa135845f10199ae352 (diff) |
Don't require build-meta.json in submitted application packages
Diffstat (limited to 'controller-server')
-rw-r--r-- | controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/pkg/ApplicationPackage.java | 4 |
1 files changed, 1 insertions, 3 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 9767ef59252..b088c2fd0fd 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 @@ -45,7 +45,7 @@ import static java.util.stream.Collectors.toMap; /** * A representation of the content of an application package. - * Only the deployment.xml content can be accessed as anything other than compressed data. + * Only meta-data content can be accessed as anything other than compressed data. * A package is identified by a hash of the content. * * This is immutable. @@ -98,8 +98,6 @@ public class ApplicationPackage { this.validationOverrides = files.get(validationOverridesFile).map(bytes -> new String(bytes, UTF_8)).map(ValidationOverrides::fromXml).orElse(ValidationOverrides.empty); Optional<Inspector> buildMetaObject = files.get(buildMetaFile).map(SlimeUtils::jsonToSlime).map(Slime::get); - if (requireFiles && buildMetaObject.isEmpty()) - throw new IllegalArgumentException("Missing required file '" + buildMetaFile + "'"); 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()))); |