Require flag to be defined in target zone

2 files changed, 38 insertions, 6 deletions

diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/systemflags/SystemFlagsDeployer.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/systemflags/SystemFlagsDeployer.java
index 820384ce810..9bd3b70cfab 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/systemflags/SystemFlagsDeployer.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/systemflags/SystemFlagsDeployer.java
@@ -96,7 +96,8 @@ class SystemFlagsDeployer  {
         createNewFlagData(target, dryRun, wantedFlagData, currentFlagData, results, errors);
         updateExistingFlagData(target, dryRun, wantedFlagData, currentFlagData, results, errors);
         removeOldFlagData(target, dryRun, wantedFlagData, currentFlagData, results, errors);
-        warnOnFlagDataForUndefinedFlags(target, wantedFlagData, currentFlagData, definedFlags, warnings);
+        failOnNewFlagDataForUndefinedFlags(target, wantedFlagData, currentFlagData, definedFlags, errors);
+        warnOnExistingFlagDataForUndefinedFlags(target, wantedFlagData, currentFlagData, definedFlags, warnings);
         return new SystemFlagsDeployResult(results, errors, warnings);
     }
 
@@ -175,11 +176,23 @@ class SystemFlagsDeployer  {
         });
     }
 
-    private static void warnOnFlagDataForUndefinedFlags(FlagsTarget target,
-                                                        Map<FlagId, FlagData> wantedFlagData,
-                                                        Map<FlagId, FlagData> currentFlagData,
-                                                        List<FlagId> definedFlags,
-                                                        List<Warning> warnings) {
+    private static void failOnNewFlagDataForUndefinedFlags(FlagsTarget target,
+                                                           Map<FlagId, FlagData> wantedFlagData,
+                                                           Map<FlagId, FlagData> currentFlagData,
+                                                           List<FlagId> definedFlags,
+                                                           List<OperationError> errors) {
+        for (FlagId flagId : wantedFlagData.keySet()) {
+            if (!currentFlagData.containsKey(flagId) && !definedFlags.contains(flagId)) {
+                errors.add(OperationError.createFailed("Flag not defined in target zone", target, wantedFlagData.get(flagId)));
+            }
+        }
+    }
+
+    private static void warnOnExistingFlagDataForUndefinedFlags(FlagsTarget target,
+                                                                Map<FlagId, FlagData> wantedFlagData,
+                                                                Map<FlagId, FlagData> currentFlagData,
+                                                                List<FlagId> definedFlags,
+                                                                List<Warning> warnings) {
         for (FlagId flagId : currentFlagData.keySet()) {
             if (wantedFlagData.containsKey(flagId) && !definedFlags.contains(flagId)) {
                 warnings.add(Warning.dataForUndefinedFlag(target, flagId));
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/systemflags/SystemFlagsDeployerTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/systemflags/SystemFlagsDeployerTest.java
index 475ac12f2fd..789be26db1f 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/systemflags/SystemFlagsDeployerTest.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/systemflags/SystemFlagsDeployerTest.java
@@ -77,6 +77,7 @@ public class SystemFlagsDeployerTest {
     public void dryrun_should_not_change_flags() throws IOException {
         FlagsClient flagsClient = mock(FlagsClient.class);
         when(flagsClient.listFlagData(controllerTarget)).thenReturn(List.of());
+        when(flagsClient.listDefinedFlags(controllerTarget)).thenReturn(List.of(new FlagId("my-flag")));
 
         FlagData defaultData = flagData("flags/my-flag/main.json");
         SystemFlagsDataArchive archive = new SystemFlagsDataArchive.Builder()
@@ -101,6 +102,7 @@ public class SystemFlagsDeployerTest {
         UncheckedIOException exception = new UncheckedIOException(new IOException("I/O error message"));
         when(flagsClient.listFlagData(prodUsWest1Target)).thenThrow(exception);
         when(flagsClient.listFlagData(prodUsEast3Target)).thenReturn(List.of());
+        when(flagsClient.listDefinedFlags(prodUsEast3Target)).thenReturn(List.of(new FlagId("my-flag")));
 
         FlagData defaultData = flagData("flags/my-flag/main.json");
         SystemFlagsDataArchive archive = new SystemFlagsDataArchive.Builder()
@@ -133,6 +135,23 @@ public class SystemFlagsDeployerTest {
     }
 
     @Test
+    public void creates_error_entry_for_flag_data_of_undefined_flag() throws IOException {
+        FlagData prodUsEast3Data = flagData("flags/my-flag/main.prod.us-east-3.json");
+        FlagsClient flagsClient = mock(FlagsClient.class);
+        when(flagsClient.listFlagData(prodUsEast3Target))
+                .thenReturn(List.of());
+        when(flagsClient.listDefinedFlags(prodUsEast3Target))
+                .thenReturn(List.of());
+        SystemFlagsDataArchive archive = new SystemFlagsDataArchive.Builder()
+                .addFile("main.prod.us-east-3.json", prodUsEast3Data)
+                .build();
+        SystemFlagsDeployer deployer = new SystemFlagsDeployer(flagsClient, SYSTEM, Set.of(prodUsEast3Target));
+        SystemFlagsDeployResult result = deployer.deployFlags(archive, true);
+        assertThat(result.errors())
+                .containsOnly(SystemFlagsDeployResult.OperationError.createFailed("Flag not defined in target zone", prodUsEast3Target, prodUsEast3Data));
+    }
+
+    @Test
     public void creates_warning_entry_for_existing_flag_data_for_undefined_flag() throws IOException {
         FlagData prodUsEast3Data = flagData("flags/my-flag/main.prod.us-east-3.json");
         FlagsClient flagsClient = mock(FlagsClient.class);