From cc4927b16a3923429de7a87c151576e8313d1ee8 Mon Sep 17 00:00:00 2001
From: jonmv <venstad@gmail.com>
Date: Tue, 19 Apr 2022 14:57:19 +0200
Subject: Stricter application id pattern

---
 .../config/model/application/provider/FilesApplicationPackage.java     | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'config-application-package')

diff --git a/config-application-package/src/main/java/com/yahoo/config/model/application/provider/FilesApplicationPackage.java b/config-application-package/src/main/java/com/yahoo/config/model/application/provider/FilesApplicationPackage.java
index 36ebb621475..0579aebe771 100644
--- a/config-application-package/src/main/java/com/yahoo/config/model/application/provider/FilesApplicationPackage.java
+++ b/config-application-package/src/main/java/com/yahoo/config/model/application/provider/FilesApplicationPackage.java
@@ -481,12 +481,13 @@ public class FilesApplicationPackage extends AbstractApplicationPackage {
     }
 
     private static ApplicationMetaData readMetaData(File appDir) {
+        String originalAppDir = preprocessed.equals(appDir.getName()) ? appDir.getParentFile().getName() : appDir.getName();
         ApplicationMetaData defaultMetaData = new ApplicationMetaData("n/a",
                                                                       "n/a",
                                                                       0L,
                                                                       false,
                                                                       ApplicationId.from(TenantName.defaultName(),
-                                                                                         ApplicationName.from(appDir.getName()),
+                                                                                         ApplicationName.from(originalAppDir),
                                                                                          InstanceName.defaultName()),
                                                                       "",
                                                                       0L,
-- 
cgit v1.2.3