Track user configured urls separately

4 files changed, 31 insertions, 10 deletions

diff --git a/config-model/src/main/java/com/yahoo/vespa/model/application/validation/UrlConfigValidator.java b/config-model/src/main/java/com/yahoo/vespa/model/application/validation/UrlConfigValidator.java
index e6cd1a9e192..8332ba0387a 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/application/validation/UrlConfigValidator.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/application/validation/UrlConfigValidator.java
@@ -5,8 +5,6 @@ import com.yahoo.config.model.deploy.DeployState;
 import com.yahoo.vespa.model.VespaModel;
 import com.yahoo.vespa.model.container.ApplicationContainerCluster;
 
-import java.util.Optional;
-
 /**
  * Validates that config using s3:// urls is used in public system and with nodes that are exclusive.
  *
@@ -33,7 +31,7 @@ public class UrlConfigValidator extends Validator {
     }
 
     private static void validateS3UlsInConfig(DeployState state, ApplicationContainerCluster cluster, boolean isExclusive) {
-        if (hasUrlInConfig(state)) {
+        if (hasUrlInConfig(cluster)) {
             // TODO: Would be even better if we could add which config/field the url is set for in the error message
             String message = "Found s3:// urls in config for container cluster " + cluster.getName();
             if ( ! state.zone().system().isPublic())
@@ -44,9 +42,8 @@ public class UrlConfigValidator extends Validator {
         }
     }
 
-    private static boolean hasUrlInConfig(DeployState state) {
-        return state.getFileRegistry().export().stream()
-                .anyMatch(fileReference -> fileReference.relativePath.startsWith("s3://"));
+    private static boolean hasUrlInConfig(ApplicationContainerCluster cluster) {
+        return cluster.userConfiguredUrls().all().size() > 0;
     }
 
 }
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 b9021912244..eb2b39f74e0 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
@@ -40,9 +40,11 @@ import com.yahoo.vespa.model.container.component.SystemBindingPattern;
 import com.yahoo.vespa.model.container.configserver.ConfigserverCluster;
 import com.yahoo.vespa.model.filedistribution.UserConfiguredFiles;
 
+import java.net.URL;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
+import java.util.HashSet;
 import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Optional;
@@ -100,6 +102,8 @@ public final class ApplicationContainerCluster extends ContainerCluster<Applicat
 
     private List<ApplicationClusterEndpoint> endpoints = List.of();
 
+    private UserConfiguredUrls userConfiguredUrls = new UserConfiguredUrls();
+
     public ApplicationContainerCluster(TreeConfigProducer<?> parent, String configSubId, String clusterId, DeployState deployState) {
         super(parent, configSubId, clusterId, deployState, true, 10);
         this.tlsClientAuthority = deployState.tlsClientAuthority();
@@ -127,6 +131,8 @@ public final class ApplicationContainerCluster extends ContainerCluster<Applicat
                 : defaultHeapSizePercentageOfAvailableMemory;
     }
 
+    public UserConfiguredUrls userConfiguredUrls() { return userConfiguredUrls; }
+
     @Override
     protected void doPrepare(DeployState deployState) {
         super.doPrepare(deployState);
@@ -147,7 +153,9 @@ public final class ApplicationContainerCluster extends ContainerCluster<Applicat
         if (containers.isEmpty()) return;
 
         // Files referenced from user configs to all components.
-        UserConfiguredFiles files = new UserConfiguredFiles(deployState.getFileRegistry(), deployState.getDeployLogger());
+        UserConfiguredFiles files = new UserConfiguredFiles(deployState.getFileRegistry(),
+                                                            deployState.getDeployLogger(),
+                                                            userConfiguredUrls);
         for (Component<?, ?> component : getAllComponents()) {
             files.register(component);
         }
@@ -390,4 +398,14 @@ public final class ApplicationContainerCluster extends ContainerCluster<Applicat
         }
     }
 
+    public static class UserConfiguredUrls {
+
+        private final Set<String> urls = new HashSet<>();
+
+        public void add(String url) { urls.add(url); }
+
+        public Set<String> all() { return urls; }
+
+    }
+
 }
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 8d8b4d72f4d..03541ecadf3 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
@@ -11,6 +11,7 @@ import com.yahoo.path.Path;
 import com.yahoo.vespa.config.ConfigDefinition;
 import com.yahoo.vespa.config.ConfigDefinitionKey;
 import com.yahoo.vespa.config.ConfigPayloadBuilder;
+
 import com.yahoo.yolean.Exceptions;
 
 import java.io.File;
@@ -21,6 +22,8 @@ import java.util.Map;
 import java.util.Optional;
 import java.util.logging.Level;
 
+import static com.yahoo.vespa.model.container.ApplicationContainerCluster.UserConfiguredUrls;
+
 /**
  * Utility methods for registering file distribution of files/paths/urls/models defined by the user.
  *
@@ -30,10 +33,12 @@ public class UserConfiguredFiles implements Serializable {
 
     private final FileRegistry fileRegistry;
     private final DeployLogger logger;
+    private final UserConfiguredUrls userConfiguredUrls;
 
-    public UserConfiguredFiles(FileRegistry fileRegistry, DeployLogger logger) {
+    public UserConfiguredFiles(FileRegistry fileRegistry, DeployLogger logger, UserConfiguredUrls userConfiguredUrls) {
         this.fileRegistry = fileRegistry;
         this.logger = logger;
+        this.userConfiguredUrls = userConfiguredUrls;
     }
 
     /**
@@ -134,7 +139,7 @@ public class UserConfiguredFiles implements Serializable {
         if (isModelType) {
             var modelReference = ModelReference.valueOf(builder.getValue());
             if (modelReference.path().isEmpty()) {
-                modelReference.url().ifPresent(url -> fileRegistry.addUri(url.value()));
+                modelReference.url().ifPresent(url -> userConfiguredUrls.add(url.value()));
                 return;
             }
             path = Path.fromString(modelReference.path().get().value());
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/filedistribution/UserConfiguredFilesTest.java b/config-model/src/test/java/com/yahoo/vespa/model/filedistribution/UserConfiguredFilesTest.java
index bb5ba840c2c..e2a25642575 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/filedistribution/UserConfiguredFilesTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/filedistribution/UserConfiguredFilesTest.java
@@ -13,6 +13,7 @@ import com.yahoo.vespa.config.ConfigDefinition;
 import com.yahoo.vespa.config.ConfigDefinitionKey;
 import com.yahoo.vespa.config.ConfigPayloadBuilder;
 import com.yahoo.vespa.model.SimpleConfigProducer;
+import com.yahoo.vespa.model.container.ApplicationContainerCluster;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.io.TempDir;
@@ -68,7 +69,7 @@ public class UserConfiguredFilesTest {
     }
 
     private UserConfiguredFiles userConfiguredFiles() {
-        return new UserConfiguredFiles(fileRegistry, new BaseDeployLogger());
+        return new UserConfiguredFiles(fileRegistry, new BaseDeployLogger(), new ApplicationContainerCluster.UserConfiguredUrls());
     }
 
     @BeforeEach