From 00013a88a85d0b925f239697cad15876ce2e6b53 Mon Sep 17 00:00:00 2001
From: Morten Tokle <mortent@yahooinc.com>
Date: Tue, 22 Nov 2022 13:58:28 +0100
Subject: Generate minimal config for legacy mode

---
 .../yahoo/vespa/model/container/http/Client.java   |  9 ---------
 .../model/container/xml/CloudDataPlaneFilter.java  | 22 +++++++++++++---------
 .../model/container/xml/ContainerModelBuilder.java |  2 +-
 3 files changed, 14 insertions(+), 19 deletions(-)

(limited to 'config-model')

diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/http/Client.java b/config-model/src/main/java/com/yahoo/vespa/model/container/http/Client.java
index f588f4f5962..c851ab2bee6 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/container/http/Client.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/container/http/Client.java
@@ -20,15 +20,6 @@ public class Client {
         this.certificates = certificates;
     }
 
-//    public static Client createLegacyClient(List<X509Certificate> certificates) {
-//        return new Client(true, "default", List.of(AclMapping.Action.READ.name(), AclMapping.Action.WRITE.name()), certificates);
-//    }
-//
-//    public static Client createClient(String id, List<String> permissions, List<X509Certificate> certificates) {
-//        return new Client(false, id, permissions, certificates);
-//    }
-//
-
     public String id() {
         return id;
     }
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/xml/CloudDataPlaneFilter.java b/config-model/src/main/java/com/yahoo/vespa/model/container/xml/CloudDataPlaneFilter.java
index 953b7f21985..97cc34f2d7a 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/container/xml/CloudDataPlaneFilter.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/container/xml/CloudDataPlaneFilter.java
@@ -27,14 +27,18 @@ public class CloudDataPlaneFilter extends SimpleComponent implements CloudDataPl
 
     @Override
     public void getConfig(CloudDataPlaneFilterConfig.Builder builder) {
-        List<Client> clients = cluster.getClients();
-        builder.legacyMode(legacyMode);
-        List<CloudDataPlaneFilterConfig.Clients.Builder> clientsList = clients.stream()
-                .map(x -> new CloudDataPlaneFilterConfig.Clients.Builder()
-                        .id(x.id())
-                        .certificates(X509CertificateUtils.toPem(x.certificates()))
-                        .permissions(x.permissions()))
-                .toList();
-        builder.clients(clientsList);
+        if (legacyMode) {
+            builder.legacyMode(true);
+        } else {
+            List<Client> clients = cluster.getClients();
+            builder.legacyMode(false);
+            List<CloudDataPlaneFilterConfig.Clients.Builder> clientsList = clients.stream()
+                    .map(x -> new CloudDataPlaneFilterConfig.Clients.Builder()
+                            .id(x.id())
+                            .certificates(X509CertificateUtils.toPem(x.certificates()))
+                            .permissions(x.permissions()))
+                    .toList();
+            builder.clients(clientsList);
+        }
     }
 }
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilder.java b/config-model/src/main/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilder.java
index 1301ab5055b..97355c647ba 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilder.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilder.java
@@ -457,7 +457,7 @@ public class ContainerModelBuilder extends ConfigModelBuilder<ContainerModel> {
         boolean legacyMode = false;
         if (clientsElement == null) {
             Client defaultClient = new Client("default",
-                                              List.of(AclMapping.Action.READ.name(), AclMapping.Action.WRITE.name()),
+                                              List.of(),
                                               getCertificates(app.getFile(Path.fromString("security/clients.pem"))));
             clients = List.of(defaultClient);
             legacyMode = true;
-- 
cgit v1.2.3