Make APPLICATION_FILES_WITH_UNKNOWN_EXTENSION a permanent flag

3 files changed, 8 insertions, 9 deletions

diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionRepository.java b/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionRepository.java
index 2e9c28bdc3b..f0504ba32c0 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionRepository.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionRepository.java
@@ -43,7 +43,7 @@ import com.yahoo.vespa.config.server.zookeeper.ZKApplication;
 import com.yahoo.vespa.curator.Curator;
 import com.yahoo.vespa.defaults.Defaults;
 import com.yahoo.vespa.flags.FlagSource;
-import com.yahoo.vespa.flags.Flags;
+import com.yahoo.vespa.flags.PermanentFlags;
 import com.yahoo.vespa.flags.UnboundStringFlag;
 import com.yahoo.yolean.Exceptions;
 import org.apache.curator.framework.CuratorFramework;
@@ -724,7 +724,7 @@ public class SessionRepository {
             app.validateFileExtensions();
         } catch (IllegalArgumentException e) {
             if (configserverConfig.hostedVespa()) {
-                UnboundStringFlag flag = Flags.APPLICATION_FILES_WITH_UNKNOWN_EXTENSION;
+                UnboundStringFlag flag = PermanentFlags.APPLICATION_FILES_WITH_UNKNOWN_EXTENSION;
                 String value = flag.bindTo(flagSource).with(APPLICATION_ID, applicationId.serializedForm()).value();
                 switch (value) {
                     case "FAIL" -> throw e;
diff --git a/flags/src/main/java/com/yahoo/vespa/flags/Flags.java b/flags/src/main/java/com/yahoo/vespa/flags/Flags.java
index f7237b32dc8..25dc7ccf228 100644
--- a/flags/src/main/java/com/yahoo/vespa/flags/Flags.java
+++ b/flags/src/main/java/com/yahoo/vespa/flags/Flags.java
@@ -416,13 +416,6 @@ public class Flags {
             "Takes effect at redeployment",
             ZONE_ID, APPLICATION_ID);
 
-    public static final UnboundStringFlag APPLICATION_FILES_WITH_UNKNOWN_EXTENSION = defineStringFlag(
-            "fail-deployment-for-files-with-unknown-extension", "FAIL",
-            List.of("hmusum"), "2022-04-27", "2022-10-01",
-            "Whether to log or fail for deployments when app has a file with unknown extension (valid values: LOG, FAIL)",
-            "Takes effect at redeployment",
-            ZONE_ID, APPLICATION_ID);
-
     public static final UnboundBooleanFlag NOTIFICATION_DISPATCH_FLAG = defineFeatureFlag(
             "dispatch-notifications", false,
             List.of("enygaard"), "2022-05-02", "2022-09-30",
diff --git a/flags/src/main/java/com/yahoo/vespa/flags/PermanentFlags.java b/flags/src/main/java/com/yahoo/vespa/flags/PermanentFlags.java
index 2bf7789ead7..7766faf28c7 100644
--- a/flags/src/main/java/com/yahoo/vespa/flags/PermanentFlags.java
+++ b/flags/src/main/java/com/yahoo/vespa/flags/PermanentFlags.java
@@ -284,6 +284,12 @@ public class PermanentFlags {
             "Takes effect on next deployment through controller",
             TENANT_ID);
 
+    public static final UnboundStringFlag APPLICATION_FILES_WITH_UNKNOWN_EXTENSION = defineStringFlag(
+            "fail-deployment-for-files-with-unknown-extension", "FAIL",
+            "Whether to log or fail for deployments when app has a file with unknown extension (valid values: LOG, FAIL)",
+            "Takes effect at redeployment",
+            ZONE_ID, APPLICATION_ID);
+
     private PermanentFlags() {}
 
     private static UnboundBooleanFlag defineFeatureFlag(