Handle blank file as flag data with only id

1 files changed, 20 insertions, 16 deletions

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 83e3c03ffaa..dc5c15aa652 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
@@ -48,10 +48,8 @@ public class SystemFlagsDataArchive {
                 String name = entry.getName();
                 if (!entry.isDirectory() && name.startsWith("flags/") && name.endsWith(".json")) {
                     Path filePath = Paths.get(name);
-                    String filename = filePath.getFileName().toString();
-                    FlagData flagData = FlagData.deserializeUtf8Json(zipIn.readAllBytes());
-                    verifyFlagDataMatchesDirectoryName(filePath, flagData);
-                    builder.addFile(filename, flagData);
+                    String rawData = new String(zipIn.readAllBytes());
+                    addFile(builder, rawData, filePath);
                 }
             }
             return builder.build();
@@ -70,13 +68,10 @@ public class SystemFlagsDataArchive {
             Builder builder = new Builder();
             directoryStream.forEach(absolutePath -> {
                 Path relativePath = root.relativize(absolutePath);
-                if (!Files.isDirectory(absolutePath) && relativePath.startsWith("flags")) {
-                    String filename = relativePath.getFileName().toString();
-                    if (filename.endsWith(".json")) {
-                        FlagData flagData = FlagData.deserializeUtf8Json(uncheck(() -> Files.readAllBytes(absolutePath)));
-                        verifyFlagDataMatchesDirectoryName(relativePath, flagData);
-                        builder.addFile(filename, flagData);
-                    }
+                if (!Files.isDirectory(absolutePath) &&
+                        relativePath.startsWith("flags") && relativePath.toString().endsWith(".json")) {
+                    String rawData = uncheck(() -> Files.readString(absolutePath));
+                    addFile(builder, rawData, relativePath);
                 }
             });
             return builder.build();
@@ -114,12 +109,21 @@ public class SystemFlagsDataArchive {
         return targetData;
     }
 
-    private static void verifyFlagDataMatchesDirectoryName(Path filePath, FlagData flagData) {
-        String flagDirectoryName = filePath.getName(1).toString();
-        if (!flagDirectoryName.equals(flagData.id().toString())) {
-            throw new IllegalArgumentException(
-                    String.format("Flag data file with flag id '%s' in directory for '%s'", flagData.id(), flagDirectoryName));
+    private static void addFile(Builder builder, String rawData, Path filePath) {
+        String filename = filePath.getFileName().toString();
+        FlagId directoryDeducedFlagId = new FlagId(filePath.getName(1).toString());
+        FlagData flagData;
+        if (rawData.isBlank()) {
+            flagData = new FlagData(directoryDeducedFlagId);
+        } else {
+            flagData = FlagData.deserialize(rawData);
+            if (!directoryDeducedFlagId.equals(flagData.id())) {
+                throw new IllegalArgumentException(
+                        String.format("Flag data file with flag id '%s' in directory for '%s'",
+                                      flagData.id(), directoryDeducedFlagId.toString()));
+            }
         }
+        builder.addFile(filename, flagData);
     }
 
     public static class Builder {