Use config-provisioning DockerImage in docker-api

3 files changed, 8 insertions, 5 deletions

diff --git a/docker-api/src/test/java/com/yahoo/vespa/hosted/dockerapi/CreateContainerCommandImplTest.java b/docker-api/src/test/java/com/yahoo/vespa/hosted/dockerapi/CreateContainerCommandImplTest.java
index ccaf8fb652d..7d41d873be2 100644
--- a/docker-api/src/test/java/com/yahoo/vespa/hosted/dockerapi/CreateContainerCommandImplTest.java
+++ b/docker-api/src/test/java/com/yahoo/vespa/hosted/dockerapi/CreateContainerCommandImplTest.java
@@ -2,6 +2,7 @@
 package com.yahoo.vespa.hosted.dockerapi;
 
 
+import com.yahoo.config.provision.DockerImage;
 import org.junit.Test;
 
 import java.net.InetAddress;
@@ -16,7 +17,7 @@ public class CreateContainerCommandImplTest {
 
     @Test
     public void testToString() throws UnknownHostException {
-        DockerImage dockerImage = new DockerImage("docker.registry.domain.tld/my/image:1.2.3");
+        DockerImage dockerImage = DockerImage.fromString("docker.registry.domain.tld/my/image:1.2.3");
         ContainerResources containerResources = new ContainerResources(2.5, 100, 1024);
         String hostname = "docker-1.region.domain.tld";
         ContainerName containerName = ContainerName.fromHostname(hostname);
diff --git a/docker-api/src/test/java/com/yahoo/vespa/hosted/dockerapi/DockerImageGarbageCollectionTest.java b/docker-api/src/test/java/com/yahoo/vespa/hosted/dockerapi/DockerImageGarbageCollectionTest.java
index 5a6efb68d14..412b8301e4c 100644
--- a/docker-api/src/test/java/com/yahoo/vespa/hosted/dockerapi/DockerImageGarbageCollectionTest.java
+++ b/docker-api/src/test/java/com/yahoo/vespa/hosted/dockerapi/DockerImageGarbageCollectionTest.java
@@ -5,6 +5,7 @@ import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.github.dockerjava.api.model.Image;
+import com.yahoo.config.provision.DockerImage;
 import com.yahoo.test.ManualClock;
 import org.junit.Test;
 
@@ -200,11 +201,11 @@ public class DockerImageGarbageCollectionTest {
             clock.advance(Duration.ofMinutes(minutesAfter));
 
             imageGC.deleteUnusedDockerImages(
-                    except.stream().map(DockerImage::new).collect(Collectors.toList()),
+                    except.stream().map(DockerImage::fromString).collect(Collectors.toList()),
                     Duration.ofHours(1).minusSeconds(1));
 
             Arrays.stream(imageIds)
-                    .map(DockerImage::new)
+                    .map(DockerImage::fromString)
                     .forEach(image -> {
                         int newValue = numDeletes.getOrDefault(image, 0) + 1;
                         numDeletes.put(image, newValue);
diff --git a/docker-api/src/test/java/com/yahoo/vespa/hosted/dockerapi/DockerImplTest.java b/docker-api/src/test/java/com/yahoo/vespa/hosted/dockerapi/DockerImplTest.java
index 8d9ea61c1d9..df221302575 100644
--- a/docker-api/src/test/java/com/yahoo/vespa/hosted/dockerapi/DockerImplTest.java
+++ b/docker-api/src/test/java/com/yahoo/vespa/hosted/dockerapi/DockerImplTest.java
@@ -13,6 +13,7 @@ import com.github.dockerjava.api.command.InspectImageResponse;
 import com.github.dockerjava.api.command.PullImageCmd;
 import com.github.dockerjava.api.exception.NotFoundException;
 import com.github.dockerjava.core.command.ExecStartResultCallback;
+import com.yahoo.config.provision.DockerImage;
 import com.yahoo.metrics.simple.MetricReceiver;
 import com.yahoo.vespa.hosted.dockerapi.metrics.MetricReceiverWrapper;
 import org.junit.Test;
@@ -76,7 +77,7 @@ public class DockerImplTest {
     @Test
     @SuppressWarnings({"unchecked", "rawtypes"})
     public void pullImageAsyncIfNeededSuccessfully() {
-        final DockerImage image = new DockerImage("test:1.2.3");
+        final DockerImage image = DockerImage.fromString("test:1.2.3");
 
         InspectImageResponse inspectImageResponse = mock(InspectImageResponse.class);
         when(inspectImageResponse.getId()).thenReturn(image.asString());
@@ -105,7 +106,7 @@ public class DockerImplTest {
     @Test
     @SuppressWarnings({"unchecked", "rawtypes"})
     public void pullImageAsyncIfNeededWithError() {
-        final DockerImage image = new DockerImage("test:1.2.3");
+        final DockerImage image = DockerImage.fromString("test:1.2.3");
 
         InspectImageCmd imageInspectCmd = mock(InspectImageCmd.class);
         when(imageInspectCmd.exec()).thenThrow(new NotFoundException("Image not found"));