Merge pull request #28933 from vespa-engine/hmusum/validate-actual-file-in-user-config

Use actual files in application package to validate file/directory in…

2 files changed, 10 insertions, 4 deletions

diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/ApplicationContainerCluster.java b/config-model/src/main/java/com/yahoo/vespa/model/container/ApplicationContainerCluster.java
index 9821f3b9568..f434d056bfc 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/container/ApplicationContainerCluster.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/container/ApplicationContainerCluster.java
@@ -166,7 +166,8 @@ public final class ApplicationContainerCluster extends ContainerCluster<Applicat
         UserConfiguredFiles files = new UserConfiguredFiles(deployState.getFileRegistry(),
                                                             deployState.getDeployLogger(),
                                                             deployState.featureFlags(),
-                                                            userConfiguredUrls);
+                                                            userConfiguredUrls,
+                                                            deployState.getApplicationPackage());
         for (Component<?, ?> component : getAllComponents()) {
             files.register(component);
         }
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/filedistribution/UserConfiguredFiles.java b/config-model/src/main/java/com/yahoo/vespa/model/filedistribution/UserConfiguredFiles.java
index 47ae2f40414..b10da29ee04 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/filedistribution/UserConfiguredFiles.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/filedistribution/UserConfiguredFiles.java
@@ -3,6 +3,8 @@ package com.yahoo.vespa.model.filedistribution;
 
 import com.yahoo.config.FileReference;
 import com.yahoo.config.ModelReference;
+import com.yahoo.config.application.api.ApplicationFile;
+import com.yahoo.config.application.api.ApplicationPackage;
 import com.yahoo.config.application.api.DeployLogger;
 import com.yahoo.config.application.api.FileRegistry;
 import com.yahoo.config.model.api.ModelContext;
@@ -37,14 +39,17 @@ public class UserConfiguredFiles implements Serializable {
     private final DeployLogger logger;
     private final UserConfiguredUrls userConfiguredUrls;
     private final String unknownConfigDefinition;
+    private final ApplicationPackage applicationPackage;
 
     public UserConfiguredFiles(FileRegistry fileRegistry, DeployLogger logger,
                                ModelContext.FeatureFlags featureFlags,
-                               UserConfiguredUrls userConfiguredUrls) {
+                               UserConfiguredUrls userConfiguredUrls,
+                               ApplicationPackage applicationPackage) {
         this.fileRegistry = fileRegistry;
         this.logger = logger;
         this.userConfiguredUrls = userConfiguredUrls;
         this.unknownConfigDefinition = featureFlags.unknownConfigDefinition();
+        this.applicationPackage = applicationPackage;
     }
 
     /**
@@ -155,8 +160,8 @@ public class UserConfiguredFiles implements Serializable {
             path = Path.fromString(builder.getValue());
         }
 
-        File file = path.toFile();
-        if (file.isDirectory() && (file.listFiles() == null || file.listFiles().length == 0))
+        ApplicationFile file = applicationPackage.getFile(path);
+        if (file.isDirectory() && (file.listFiles() == null || file.listFiles().isEmpty()))
             throw new IllegalArgumentException("Directory '" + path.getRelative() + "' is empty");
 
         FileReference reference = registeredFiles.get(path);