diff options
author | Håkon Hallingstad <hakon@yahooinc.com> | 2021-09-28 17:08:24 +0200 |
---|---|---|
committer | Håkon Hallingstad <hakon@yahooinc.com> | 2021-09-28 17:08:24 +0200 |
commit | 27d411c8edddd714b9cb45fb7187d3bb7097d7c8 (patch) | |
tree | ea8581490af0ea4a8cc9e720966a80f9fdfe71a9 /controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/systemflags/v1/SystemFlagsDataArchive.java | |
parent | a157b68a895eaf62bcf753a2698a8617890248db (diff) |
Fail hosted-feature-flags dry run if overrides for undefined flags
Diffstat (limited to 'controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/systemflags/v1/SystemFlagsDataArchive.java')
-rw-r--r-- | controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/systemflags/v1/SystemFlagsDataArchive.java | 5 |
1 files changed, 3 insertions, 2 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 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); |