diff options
author | HÃ¥kon Hallingstad <hakon@verizonmedia.com> | 2021-09-30 13:27:13 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-09-30 13:27:13 +0200 |
commit | 6b5c10b1dc8f913dd2e9889db787e89db45b2318 (patch) | |
tree | 94cc87eca0d80f131aa6da7d6eb70ca91d55d5fb /controller-api | |
parent | 0ddc5065bc0d1c79529a060aeb88a600cd344ea2 (diff) | |
parent | f8bff03382a9a9ea3db757d4ae0022c727ec8617 (diff) |
Merge pull request #19335 from vespa-engine/hakonhall/fail-hosted-feature-flags-dry-run-if-overrides-for-undefined-flags
Fail hosted-feature-flags dry run if overrides for undefined flags
Diffstat (limited to 'controller-api')
-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); |