From 4c05924a45b3da8f7c2814717d794ae0ed230c91 Mon Sep 17 00:00:00 2001
From: Bjørn Christian Seime <bjorncs@verizonmedia.com>
Date: Fri, 8 Nov 2019 15:36:29 +0100
Subject: Verify that 'flags' directory exists

---
 .../hosted/controller/api/systemflags/v1/SystemFlagsDataArchive.java  | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'controller-api')

diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/systemflags/v1/SystemFlagsDataArchive.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/systemflags/v1/SystemFlagsDataArchive.java
index ec14dcb7123..83e3c03ffaa 100644
--- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/systemflags/v1/SystemFlagsDataArchive.java
+++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/systemflags/v1/SystemFlagsDataArchive.java
@@ -62,6 +62,10 @@ public class SystemFlagsDataArchive {
 
     public static SystemFlagsDataArchive fromDirectory(Path directory) {
         Path root = directory.toAbsolutePath();
+        Path flagsDirectory = directory.resolve("flags");
+        if (!Files.isDirectory(flagsDirectory)) {
+            throw new IllegalArgumentException("Sub-directory 'flags' does not exist: " + flagsDirectory);
+        }
         try (Stream<Path> directoryStream = Files.walk(root)) {
             Builder builder = new Builder();
             directoryStream.forEach(absolutePath -> {
-- 
cgit v1.2.3