Remove 'user' field in application metadata and add deprecations for usage

User was set in older Vespa versions when deploying locally, not set
anymore and should not be used. Deprecate and add TODOs to remove in
Vespa 9

4 files changed, 3 insertions, 10 deletions

diff --git a/config-model/src/main/java/com/yahoo/config/model/test/MockApplicationPackage.java b/config-model/src/main/java/com/yahoo/config/model/test/MockApplicationPackage.java
index abd7ba3be9f..9f54be0c762 100644
--- a/config-model/src/main/java/com/yahoo/config/model/test/MockApplicationPackage.java
+++ b/config-model/src/main/java/com/yahoo/config/model/test/MockApplicationPackage.java
@@ -46,7 +46,6 @@ import java.util.stream.Collectors;
  */
 public class MockApplicationPackage implements ApplicationPackage {
 
-    public static final String DEPLOYED_BY_USER = "user";
     public static final String APPLICATION_NAME = "application";
     public static final long APPLICATION_GENERATION = 1L;
     public static final String MUSIC_SCHEMA = createSchema("music", "foo");
@@ -80,8 +79,7 @@ public class MockApplicationPackage implements ApplicationPackage {
         this.failOnValidateXml = failOnValidateXml;
         queryProfileRegistry = new QueryProfileXMLReader().read(asNamedReaderList(queryProfileType),
                                                                 asNamedReaderList(queryProfile));
-        applicationMetaData = new ApplicationMetaData(DEPLOYED_BY_USER,
-                                                      "dir",
+        applicationMetaData = new ApplicationMetaData("dir",
                                                       0L,
                                                       false,
                                                       ApplicationId.from(TenantName.defaultName(),
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/ContainerCluster.java b/config-model/src/main/java/com/yahoo/vespa/model/container/ContainerCluster.java
index 3d4b6dcbe7e..3dd9e9770c4 100755
--- a/config-model/src/main/java/com/yahoo/vespa/model/container/ContainerCluster.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/container/ContainerCluster.java
@@ -436,14 +436,12 @@ public abstract class ContainerCluster<CONTAINER extends Container>
 
     @Override
     public void getConfig(ApplicationMetadataConfig.Builder builder) {
-        if (applicationMetaData != null) {
+        if (applicationMetaData != null)
             builder.name(applicationMetaData.getApplicationId().application().value()).
-                    user(applicationMetaData.getDeployedByUser()).
                     path(applicationMetaData.getDeployPath()).
                     timestamp(applicationMetaData.getDeployTimestamp()).
                     checksum(applicationMetaData.getChecksum()).
                     generation(applicationMetaData.getGeneration());
-        }
     }
 
     /**
diff --git a/config-model/src/test/java/com/yahoo/config/model/ApplicationDeployTest.java b/config-model/src/test/java/com/yahoo/config/model/ApplicationDeployTest.java
index 57a61e40d89..ec5850b95b9 100644
--- a/config-model/src/test/java/com/yahoo/config/model/ApplicationDeployTest.java
+++ b/config-model/src/test/java/com/yahoo/config/model/ApplicationDeployTest.java
@@ -227,8 +227,7 @@ public class ApplicationDeployTest {
         String appPkg = TESTDIR + "app1";
         IOUtils.copyDirectory(new File(appPkg), tmp);
         ApplicationId applicationId = ApplicationId.from("tenant1", "application1", "instance1");
-        DeployData deployData = new DeployData("foo",
-                                               "bar",
+        DeployData deployData = new DeployData("bar",
                                                applicationId,
                                                13L,
                                                false,
@@ -238,7 +237,6 @@ public class ApplicationDeployTest {
         app.writeMetaData();
         FilesApplicationPackage newApp = FilesApplicationPackage.fromFileWithDeployData(tmp, deployData);
         ApplicationMetaData meta = newApp.getMetaData();
-        assertEquals("foo", meta.getDeployedByUser());
         assertEquals("bar", meta.getDeployPath());
         assertEquals(applicationId, meta.getApplicationId());
         assertEquals(13L, (long)meta.getDeployTimestamp());
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/admin/metricsproxy/MetricsProxyContainerClusterTest.java b/config-model/src/test/java/com/yahoo/vespa/model/admin/metricsproxy/MetricsProxyContainerClusterTest.java
index 7bf08461df7..45d9b2db096 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/admin/metricsproxy/MetricsProxyContainerClusterTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/admin/metricsproxy/MetricsProxyContainerClusterTest.java
@@ -64,7 +64,6 @@ public class MetricsProxyContainerClusterTest {
         ApplicationMetadataConfig config = builder.build();
         assertEquals(MockApplicationPackage.APPLICATION_GENERATION, config.generation());
         assertEquals(MockApplicationPackage.APPLICATION_NAME, config.name());
-        assertEquals(MockApplicationPackage.DEPLOYED_BY_USER, config.user());
     }
 
     @Test