summaryrefslogtreecommitdiffstats
path: root/controller-api
diff options
context:
space:
mode:
authorjonmv <venstad@gmail.com>2022-04-10 13:37:37 +0200
committerjonmv <venstad@gmail.com>2022-04-11 13:42:26 +0200
commit17a380052106a76047c614fb1d0d6571c75b2b13 (patch)
treeaaf7df8c744acbb875baceee642501a961f1263a /controller-api
parente64eb299b12e79c9d9cbc2c8129f8225291daf90 (diff)
Use a fixed time in controller rest api tests
Diffstat (limited to 'controller-api')
-rw-r--r--controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/certificates/EndpointCertificateMock.java6
-rw-r--r--controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/deployment/ApplicationStore.java4
2 files changed, 7 insertions, 3 deletions
diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/certificates/EndpointCertificateMock.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/certificates/EndpointCertificateMock.java
index 19dc852da21..3bc3d3ee9e8 100644
--- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/certificates/EndpointCertificateMock.java
+++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/certificates/EndpointCertificateMock.java
@@ -3,6 +3,7 @@ package com.yahoo.vespa.hosted.controller.api.integration.certificates;
import com.yahoo.config.provision.ApplicationId;
+import java.time.Clock;
import java.time.Instant;
import java.util.Collections;
import java.util.HashMap;
@@ -20,6 +21,11 @@ public class EndpointCertificateMock implements EndpointCertificateProvider {
private final Map<ApplicationId, List<String>> dnsNames = new HashMap<>();
private final Map<String, EndpointCertificateMetadata> providerMetadata = new HashMap<>();
+ private final Clock clock;
+
+ public EndpointCertificateMock(Clock clock) {
+ this.clock = clock;
+ }
public List<String> dnsNamesOf(ApplicationId application) {
return Collections.unmodifiableList(dnsNames.getOrDefault(application, List.of()));
diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/deployment/ApplicationStore.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/deployment/ApplicationStore.java
index 1c697baa3f6..fef95155440 100644
--- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/deployment/ApplicationStore.java
+++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/deployment/ApplicationStore.java
@@ -9,9 +9,7 @@ import java.time.Instant;
import java.util.Optional;
/**
- * Store for the application and tester packages.
- *
- * This will replace ArtifactRepository for tenant applications.
+ * Store for the application and test packages, diffs, and other metadata.
*
* @author smorgrav
* @author jonmv