From b6f8c1f30b7f1b6168385ce947176e44e18eec7a Mon Sep 17 00:00:00 2001
From: Harald Musum <musum@yahooinc.com>
Date: Mon, 4 Jul 2022 13:09:10 +0200
Subject: 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
---
 config-model-api/abi-spec.json                     |  1 +
 .../application/api/ApplicationMetaData.java       | 24 +++++++++++-----------
 2 files changed, 13 insertions(+), 12 deletions(-)

(limited to 'config-model-api')

diff --git a/config-model-api/abi-spec.json b/config-model-api/abi-spec.json
index 47228cf7768..672ad4071d6 100644
--- a/config-model-api/abi-spec.json
+++ b/config-model-api/abi-spec.json
@@ -71,6 +71,7 @@
       "public"
     ],
     "methods": [
+      "public void <init>(java.lang.String, java.lang.Long, boolean, com.yahoo.config.provision.ApplicationId, java.lang.String, java.lang.Long, long)",
       "public void <init>(java.lang.String, java.lang.String, java.lang.Long, boolean, com.yahoo.config.provision.ApplicationId, java.lang.String, java.lang.Long, long)",
       "public java.lang.String getDeployedByUser()",
       "public java.lang.String getDeployPath()",
diff --git a/config-model-api/src/main/java/com/yahoo/config/application/api/ApplicationMetaData.java b/config-model-api/src/main/java/com/yahoo/config/application/api/ApplicationMetaData.java
index 8eec22ddc5d..a23afd994f2 100644
--- a/config-model-api/src/main/java/com/yahoo/config/application/api/ApplicationMetaData.java
+++ b/config-model-api/src/main/java/com/yahoo/config/application/api/ApplicationMetaData.java
@@ -17,7 +17,6 @@ import java.io.IOException;
  */
 public class ApplicationMetaData {
 
-    private final String deployedByUser;
     private final String deployedFromDir;
     private final long deployTimestamp;
     private final boolean internalRedeploy;
@@ -26,9 +25,15 @@ public class ApplicationMetaData {
     private final long generation;
     private final long previousActiveGeneration;
 
-    public ApplicationMetaData(String deployedByUser, String deployedFromDir, Long deployTimestamp, boolean internalRedeploy,
+    public ApplicationMetaData(String deployedFromDir, Long deployTimestamp, boolean internalRedeploy,
+                               ApplicationId applicationId, String checksum, Long generation, long previousActiveGeneration) {
+        this("unknown", deployedFromDir, deployTimestamp, internalRedeploy, applicationId, checksum, generation, previousActiveGeneration);
+    }
+
+    @Deprecated
+    // TODO: Remove in Vespa 9
+    public ApplicationMetaData(String ignored, String deployedFromDir, Long deployTimestamp, boolean internalRedeploy,
                                ApplicationId applicationId, String checksum, Long generation, long previousActiveGeneration) {
-        this.deployedByUser = deployedByUser;
         this.deployedFromDir = deployedFromDir;
         this.deployTimestamp = deployTimestamp;
         this.internalRedeploy = internalRedeploy;
@@ -40,13 +45,11 @@ public class ApplicationMetaData {
 
     /**
      * Gets the user who deployed the application.
-     * Will return null if a problem occurred while getting metadata
      *
      * @return user name for the user who ran "deploy-application"
      */
-    public String getDeployedByUser() {
-        return deployedByUser;
-    }
+    @Deprecated // TODO: Remove in Vespa 9
+    public String getDeployedByUser() { return "unknown"; }
 
     /**
      * Gets the directory where the application was deployed from.
@@ -86,8 +89,7 @@ public class ApplicationMetaData {
 
     @Override
     public String toString() {
-        return deployedByUser + ", " + deployedFromDir + ", " + deployTimestamp + ", " + generation + ", " +
-               checksum + ", " + previousActiveGeneration;
+        return deployedFromDir + ", " + deployTimestamp + ", " + generation + ", " + checksum + ", " + previousActiveGeneration;
     }
 
     public static ApplicationMetaData fromJsonString(String jsonString) {
@@ -97,8 +99,7 @@ public class ApplicationMetaData {
             Inspector deploy = root.field("deploy");
             Inspector app = root.field("application");
 
-            return new ApplicationMetaData(deploy.field("user").asString(),
-                                           deploy.field("from").asString(),
+            return new ApplicationMetaData(deploy.field("from").asString(),
                                            deploy.field("timestamp").asLong(),
                                            booleanField("internalRedeploy", false, deploy),
                                            ApplicationId.fromSerializedForm(app.field("id").asString()),
@@ -114,7 +115,6 @@ public class ApplicationMetaData {
         Slime slime = new Slime();
         Cursor meta = slime.setObject();
         Cursor deploy = meta.setObject("deploy");
-        deploy.setString("user", deployedByUser);
         deploy.setString("from", deployedFromDir);
         deploy.setLong("timestamp", deployTimestamp);
         deploy.setBool("internalRedeploy", internalRedeploy);
-- 
cgit v1.2.3