Hide container image registry in deployment logs

5 files changed, 28 insertions, 28 deletions

diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/InternalStepRunner.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/InternalStepRunner.java
index cb6e5d123ef..071dd6ae336 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/InternalStepRunner.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/InternalStepRunner.java
@@ -544,12 +544,12 @@ public class InternalStepRunner implements StepRunner {
 
 
     private String wantedPlatform(Node node) {
-        return node.wantedDockerImage().untagged() + ":" + node.wantedVersion();
+        return node.wantedDockerImage().repository() + ":" + node.wantedVersion();
     }
 
     private String currentPlatform(Node node) {
-        String currentRepo = node.currentDockerImage().untagged();
-        String wantedRepo = node.wantedDockerImage().untagged();
+        String currentRepo = node.currentDockerImage().repository();
+        String wantedRepo = node.wantedDockerImage().repository();
         return (currentRepo.equals(wantedRepo) ? "" : currentRepo + ":") + node.currentVersion();
     }
 
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/dev-us-east-1-log-first-part.json b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/dev-us-east-1-log-first-part.json
index 835bca7966e..895b49157db 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/dev-us-east-1-log-first-part.json
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/dev-us-east-1-log-first-part.json
@@ -33,7 +33,7 @@
       {
         "at": 0,
         "type": "info",
-        "message": "--- platform registry.example.com/vespa/vespa:6.1"
+        "message": "--- platform vespa/vespa:6.1"
       },
       {
         "at": 0,
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/staging-test-log.json b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/staging-test-log.json
index 32bee6c7e7e..5aa13f1cf3c 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/staging-test-log.json
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/staging-test-log.json
@@ -23,7 +23,7 @@
       {
         "at": 14503000,
         "type": "info",
-        "message": "--- platform registry.example.com/vespa/vespa:6.1"
+        "message": "--- platform vespa/vespa:6.1"
       },
       {
         "at": 14503000,
@@ -38,7 +38,7 @@
       {
         "at": 14503000,
         "type": "info",
-        "message": "--- platform registry.example.com/vespa/vespa:6.1"
+        "message": "--- platform vespa/vespa:6.1"
       },
       {
         "at": 14503000,
@@ -53,7 +53,7 @@
       {
         "at": 14503000,
         "type": "info",
-        "message": "--- platform registry.example.com/vespa/vespa:6.1"
+        "message": "--- platform vespa/vespa:6.1"
       },
       {
         "at": 14503000,
@@ -92,7 +92,7 @@
       {
         "at": 14503000,
         "type": "info",
-        "message": "--- platform registry.example.com/vespa/vespa:6.1"
+        "message": "--- platform vespa/vespa:6.1"
       },
       {
         "at": 14503000,
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/system-test-details.json b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/system-test-details.json
index 0e7c100ea4e..342db367807 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/system-test-details.json
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/system-test-details.json
@@ -28,7 +28,7 @@
       {
         "at": "(ignore)",
         "type": "info",
-        "message": "--- platform registry.example.com/vespa/vespa:6.1"
+        "message": "--- platform vespa/vespa:6.1"
       },
       {
         "at": "(ignore)",
@@ -43,7 +43,7 @@
       {
         "at": "(ignore)",
         "type": "info",
-        "message": "--- platform registry.example.com/vespa/vespa:6.1"
+        "message": "--- platform vespa/vespa:6.1"
       },
       {
         "at": "(ignore)",
@@ -58,7 +58,7 @@
       {
         "at": "(ignore)",
         "type": "info",
-        "message": "--- platform registry.example.com/vespa/vespa:6.1"
+        "message": "--- platform vespa/vespa:6.1"
       },
       {
         "at": "(ignore)",
@@ -73,7 +73,7 @@
       {
         "at": "(ignore)",
         "type": "info",
-        "message": "--- platform registry.example.com/vespa/vespa:6.1"
+        "message": "--- platform vespa/vespa:6.1"
       },
       {
         "at": "(ignore)",
@@ -112,7 +112,7 @@
       {
         "at": "(ignore)",
         "type": "info",
-        "message": "--- platform registry.example.com/vespa/vespa:6.1"
+        "message": "--- platform vespa/vespa:6.1"
       },
       {
         "at": "(ignore)",
@@ -127,7 +127,7 @@
       {
         "at": "(ignore)",
         "type": "info",
-        "message": "--- platform registry.example.com/vespa/vespa:6.1"
+        "message": "--- platform vespa/vespa:6.1"
       },
       {
         "at": "(ignore)",
@@ -142,7 +142,7 @@
       {
         "at": "(ignore)",
         "type": "info",
-        "message": "--- platform registry.example.com/vespa/vespa:6.1"
+        "message": "--- platform vespa/vespa:6.1"
       },
       {
         "at": "(ignore)",
@@ -157,7 +157,7 @@
       {
         "at": "(ignore)",
         "type": "info",
-        "message": "--- platform registry.example.com/vespa/vespa:6.1"
+        "message": "--- platform vespa/vespa:6.1"
       },
       {
         "at": "(ignore)",
@@ -172,7 +172,7 @@
       {
         "at": "(ignore)",
         "type": "info",
-        "message": "--- platform registry.example.com/vespa/vespa:6.1"
+        "message": "--- platform vespa/vespa:6.1"
       },
       {
         "at": "(ignore)",
@@ -187,7 +187,7 @@
       {
         "at": "(ignore)",
         "type": "info",
-        "message": "--- platform registry.example.com/vespa/vespa:6.1"
+        "message": "--- platform vespa/vespa:6.1"
       },
       {
         "at": "(ignore)",
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/system-test-log.json b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/system-test-log.json
index edaa01326ad..2f5e93ea3a0 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/system-test-log.json
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/system-test-log.json
@@ -23,7 +23,7 @@
       {
         "at": 0,
         "type": "info",
-        "message": "--- platform registry.example.com/vespa/vespa:6.1"
+        "message": "--- platform vespa/vespa:6.1"
       },
       {
         "at": 0,
@@ -38,7 +38,7 @@
       {
         "at": 0,
         "type": "info",
-        "message": "--- platform registry.example.com/vespa/vespa:6.1"
+        "message": "--- platform vespa/vespa:6.1"
       },
       {
         "at": 0,
@@ -53,7 +53,7 @@
       {
         "at": 0,
         "type": "info",
-        "message": "--- platform registry.example.com/vespa/vespa:6.1"
+        "message": "--- platform vespa/vespa:6.1"
       },
       {
         "at": 0,
@@ -68,7 +68,7 @@
       {
         "at": 0,
         "type": "info",
-        "message": "--- platform registry.example.com/vespa/vespa:6.1"
+        "message": "--- platform vespa/vespa:6.1"
       },
       {
         "at": 0,
@@ -107,7 +107,7 @@
       {
         "at": 0,
         "type": "info",
-        "message": "--- platform registry.example.com/vespa/vespa:6.1"
+        "message": "--- platform vespa/vespa:6.1"
       },
       {
         "at": 0,
@@ -122,7 +122,7 @@
       {
         "at": 0,
         "type": "info",
-        "message": "--- platform registry.example.com/vespa/vespa:6.1"
+        "message": "--- platform vespa/vespa:6.1"
       },
       {
         "at": 0,
@@ -137,7 +137,7 @@
       {
         "at": 0,
         "type": "info",
-        "message": "--- platform registry.example.com/vespa/vespa:6.1"
+        "message": "--- platform vespa/vespa:6.1"
       },
       {
         "at": 0,
@@ -152,7 +152,7 @@
       {
         "at": 0,
         "type": "info",
-        "message": "--- platform registry.example.com/vespa/vespa:6.1"
+        "message": "--- platform vespa/vespa:6.1"
       },
       {
         "at": 0,
@@ -167,7 +167,7 @@
       {
         "at": 0,
         "type": "info",
-        "message": "--- platform registry.example.com/vespa/vespa:6.1"
+        "message": "--- platform vespa/vespa:6.1"
       },
       {
         "at": 0,
@@ -182,7 +182,7 @@
       {
         "at": 0,
         "type": "info",
-        "message": "--- platform registry.example.com/vespa/vespa:6.1"
+        "message": "--- platform vespa/vespa:6.1"
       },
       {
         "at": 0,