Pass only relevant token data, and store in Deployment what tokens were used

1 files changed, 4 insertions, 4 deletions

diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/application/v4/model/DeploymentData.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/application/v4/model/DeploymentData.java
index d9384373deb..e0e1f013a27 100644
--- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/application/v4/model/DeploymentData.java
+++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/application/v4/model/DeploymentData.java
@@ -39,7 +39,7 @@ public class DeploymentData {
     private final List<TenantSecretStore> tenantSecretStores;
     private final List<X509Certificate> operatorCertificates;
     private final Supplier<Optional<CloudAccount>> cloudAccount;
-    private final List<DataplaneTokenVersions> dataPlaneTokens;
+    private final Supplier<List<DataplaneTokenVersions>> dataPlaneTokens;
     private final boolean dryRun;
 
     public DeploymentData(ApplicationId instance, ZoneId zone, Supplier<InputStream> applicationPackage, Version platform,
@@ -50,7 +50,7 @@ public class DeploymentData {
                           List<TenantSecretStore> tenantSecretStores,
                           List<X509Certificate> operatorCertificates,
                           Supplier<Optional<CloudAccount>> cloudAccount,
-                          List<DataplaneTokenVersions> dataPlaneTokens,
+                          Supplier<List<DataplaneTokenVersions>> dataPlaneTokens,
                           boolean dryRun) {
         this.instance = requireNonNull(instance);
         this.zone = requireNonNull(zone);
@@ -63,7 +63,7 @@ public class DeploymentData {
         this.tenantSecretStores = List.copyOf(requireNonNull(tenantSecretStores));
         this.operatorCertificates = List.copyOf(requireNonNull(operatorCertificates));
         this.cloudAccount = new Memoized<>(requireNonNull(cloudAccount));
-        this.dataPlaneTokens = dataPlaneTokens;
+        this.dataPlaneTokens = new Memoized<>(dataPlaneTokens);
         this.dryRun = dryRun;
     }
 
@@ -112,7 +112,7 @@ public class DeploymentData {
     }
 
     public List<DataplaneTokenVersions> dataPlaneTokens() {
-        return dataPlaneTokens;
+        return dataPlaneTokens.get();
     }
 
     public boolean isDryRun() {