From 27d411c8edddd714b9cb45fb7187d3bb7097d7c8 Mon Sep 17 00:00:00 2001
From: Håkon Hallingstad <hakon@yahooinc.com>
Date: Tue, 28 Sep 2021 17:08:24 +0200
Subject: Fail hosted-feature-flags dry run if overrides for undefined flags

---
 .../hosted/controller/api/systemflags/v1/SystemFlagsDataArchive.java | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(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 850e14b25e8..367b258e7b6 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
@@ -23,6 +23,7 @@ import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashSet;
 import java.util.List;
@@ -125,9 +126,9 @@ public class SystemFlagsDataArchive {
         uncheck(zipOut::flush);
     }
 
-    public Set<FlagData> flagData(FlagsTarget target) {
+    public List<FlagData> flagData(FlagsTarget target) {
         List<String> filenames = target.flagDataFilesPrioritized();
-        Set<FlagData> targetData = new HashSet<>();
+        List<FlagData> targetData = new ArrayList<>();
         files.forEach((flagId, fileMap) -> {
             for (String filename : filenames) {
                 FlagData data = fileMap.get(filename);
-- 
cgit v1.2.3